summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-04 18:30:03 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-04 18:30:03 (GMT)
commit82d2bcc7c2fe7ae5ba40b915ce22422a36d68639 (patch)
tree1fa0054a9c3d6ddcecbac17e0d00bcd3c4c003cc /SConscript
parentd684136415d5d2b255650c27f60bbda3a1a9277d (diff)
downloadpowder-82d2bcc7c2fe7ae5ba40b915ce22422a36d68639.zip
powder-82d2bcc7c2fe7ae5ba40b915ce22422a36d68639.tar.gz
More scons fixes
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/SConscript b/SConscript
index 5025789..6a3b798 100644
--- a/SConscript
+++ b/SConscript
@@ -137,16 +137,16 @@ if(GetOption('beta')):
env.Append(CPPDEFINES='BETA')
if(GetOption('snapshot')):
- env.Append(CPPDEFINES={'SNAPSHOT_ID': GetOption('snapshot')})
+ env.Append(CPPDEFINES=['SNAPSHOT_ID=' + GetOption('snapshot')])
env.Append(CPPDEFINES='SNAPSHOT')
else:
- env.Append(CPPDEFINES={"SNAPSHOT_ID": int(time.time())})
+ env.Append(CPPDEFINES=["SNAPSHOT_ID=" + str(int(time.time()))])
if(GetOption('save-version')):
- env.Append(CPPDEFINES={'SAVE_VERSION': GetOption('major-version')})
+ env.Append(CPPDEFINES=['SAVE_VERSION=' + GetOption('major-version')])
if(GetOption('minor-version')):
- env.Append(CPPDEFINES={'MINOR_VERSION': GetOption('minor-version')})
+ env.Append(CPPDEFINES=['MINOR_VERSION=' + GetOption('minor-version')])
if(GetOption('release')):
env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wunsafe-loop-optimizations'])