diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-09 15:43:13 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-09 15:43:13 (GMT) |
| commit | 249e3dcad3aa62ba09e0b712ff508d94f255a947 (patch) | |
| tree | 004584e3a72a9e616417edc7a230495f085dec3b /SConscript | |
| parent | af181faeea1437df1e236f9bfc05832e9b1ca03b (diff) | |
| parent | b1d3ebacd29f1cd6bb09c9b204d6dae257413159 (diff) | |
| download | powder-249e3dcad3aa62ba09e0b712ff508d94f255a947.zip powder-249e3dcad3aa62ba09e0b712ff508d94f255a947.tar.gz | |
Merge pull request #195 from Huulivoide/master
Minor fixes needed to build on Linux/64bit.
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -122,7 +122,7 @@ else: env.Append(LIBS=['z', 'bz2', 'fftw3f']) env.Append(CPPPATH=['src/', 'data/', 'generated/']) -env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions']) +env.Append(CCFLAGS=['-w', '-std=c++98', '-fkeep-inline-functions']) env.Append(LIBS=['pthread', 'm']) env.Append(CPPDEFINES=["USE_SDL", "LUACONSOLE", "GRAVFFT", "_GNU_SOURCE", "USE_STDINT", "_POSIX_C_SOURCE=200112L"]) @@ -237,8 +237,6 @@ if(GetOption('win')): sources+=Glob("src/*/*.cpp") sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/tools/*.cpp") -sources+=Glob("generated/ToolClasses.cpp") -sources+=Glob("generated/ElementClasses.cpp") if(GetOption('win')): sources = filter(lambda source: str(source) != 'src/simulation/Gravity.cpp', sources) @@ -273,8 +271,12 @@ if(GetOption('win')): envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2']) sources+=envCopy.Object('src/simulation/Gravity.cpp') -env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES") -env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python generator.py tools $TARGETS $SOURCES") +env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python2 generator.py elements $TARGETS $SOURCES") +sources+=Glob("generated/ElementClasses.cpp") + +env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python2 generator.py tools $TARGETS $SOURCES") +sources+=Glob("generated/ToolClasses.cpp") + env.Decider('MD5') t=env.Program(target=programName, source=sources) -Default(t)
\ No newline at end of file +Default(t) |