mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-10 10:24:07 +02:00
Code Issues Projects Releases Wiki Activity

Generate snapshot id if non given

Browse Source
This commit is contained in:
Simon Robertshaw
2012-07-22 19:39:58 +01:00
parent 45c31030a6
commit 69b5f35b96
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SConscript
View File

@@ -99,7 +99,6 @@ env.Append(CPPPATH=['src/', 'data/', 'generated/'])
env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions']) env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions'])
env.Append(LIBS=['pthread', 'm', 'bz2']) env.Append(LIBS=['pthread', 'm', 'bz2'])
env.Append(CPPDEFINES={"_POSIX_C_SOURCE": "200112L"}) env.Append(CPPDEFINES={"_POSIX_C_SOURCE": "200112L"})
env.Append(CPPDEFINES={"SNAPSHOT_ID": int(time.time())})
env.Append(CPPDEFINES=["USE_SDL", "LUACONSOLE", "GRAVFFT", "_GNU_SOURCE", "USE_STDINT"]) env.Append(CPPDEFINES=["USE_SDL", "LUACONSOLE", "GRAVFFT", "_GNU_SOURCE", "USE_STDINT"])
if GetOption("ptw32-static"): if GetOption("ptw32-static"):
@@ -132,6 +131,8 @@ if(GetOption('beta')):
if(GetOption('snapshot')): if(GetOption('snapshot')):
env.Append(CPPDEFINES={'SNAPSHOT_ID': GetOption('snapshot')}) env.Append(CPPDEFINES={'SNAPSHOT_ID': GetOption('snapshot')})
env.Append(CPPDEFINES='SNAPSHOT') env.Append(CPPDEFINES='SNAPSHOT')
else:
env.Append(CPPDEFINES={"SNAPSHOT_ID": int(time.time())})
if(GetOption('save-version')): if(GetOption('save-version')):
env.Append(CPPDEFINES={'SAVE_VERSION': GetOption('major-version')}) env.Append(CPPDEFINES={'SAVE_VERSION': GetOption('major-version')})
@@ -169,7 +170,7 @@ elif(GetOption('opengl-renderer')):
sources=Glob("src/*.cpp") sources=Glob("src/*.cpp")
if(GetOption('win32')): if(GetOption('win32')):
sources += env.RES('resources/powder-res.rc') sources += env.RES('resources/powder-res.rc')
sources+=Glob("src/*/*.cpp") sources+=Glob("src/*/*.cpp")
sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/elements/*.cpp")
sources+=Glob("src/simulation/tools/*.cpp") sources+=Glob("src/simulation/tools/*.cpp")