6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Adds a c++1z fallback for SDL builds, too.

Browse Source
This commit is contained in:
Thomas Harte
2020-07-24 22:01:22 -04:00
parent fa95a17af5
commit e097a841d2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OSBindings/SDL/SConstruct
View File

@@ -1,19 +1,19 @@
import glob import glob
import sys import sys
# establish UTF-8 encoding for Python 2 # Establish UTF-8 encoding for Python 2.
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
reload(sys) reload(sys)
sys.setdefaultencoding('utf-8') sys.setdefaultencoding('utf-8')
# create build environment # Create build environment.
env = Environment() env = Environment()
# determine compiler and linker flags for SDL # Determine compiler and linker flags for SDL.
env.ParseConfig('sdl2-config --cflags') env.ParseConfig('sdl2-config --cflags')
env.ParseConfig('sdl2-config --libs') env.ParseConfig('sdl2-config --libs')
# gather a list of source files # Gather a list of source files.
SOURCES = glob.glob('*.cpp') SOURCES = glob.glob('*.cpp')
SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp') SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp')
@@ -117,11 +117,11 @@ SOURCES += glob.glob('../../Storage/Tape/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')
# add additional compiler flags # Add additional compiler flags; c++1z is insurance in case c++17 isn't fully implemented.
env.Append(CCFLAGS = ['--std=c++17', '-Wall', '-O2', '-DNDEBUG']) env.Append(CCFLAGS = ['--std=c++17', '--std=c++1z', '-Wall', '-O2', '-DNDEBUG'])
# add additional libraries to link against # Add additional libraries to link against.
env.Append(LIBS = ['libz', 'pthread', 'GL']) env.Append(LIBS = ['libz', 'pthread', 'GL'])
# build target # Build target.
env.Program(target = 'clksignal', source = SOURCES) env.Program(target = 'clksignal', source = SOURCES)