diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-22 18:39:58 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-22 18:39:58 (GMT) |
| commit | 69b5f35b967f48d788daebb71599e04fa8ad47f9 (patch) | |
| tree | 2fa720ea5d3edebdeda7e578062f9cd66995d825 /SConscript | |
| parent | 45c31030a62d12371675d3240558e35c8ab430e7 (diff) | |
| download | powder-69b5f35b967f48d788daebb71599e04fa8ad47f9.zip powder-69b5f35b967f48d788daebb71599e04fa8ad47f9.tar.gz | |
Generate snapshot id if non given
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -99,7 +99,6 @@ env.Append(CPPPATH=['src/', 'data/', 'generated/']) env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions']) env.Append(LIBS=['pthread', 'm', 'bz2']) 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"]) if GetOption("ptw32-static"): @@ -132,6 +131,8 @@ if(GetOption('beta')): if(GetOption('snapshot')): env.Append(CPPDEFINES={'SNAPSHOT_ID': GetOption('snapshot')}) env.Append(CPPDEFINES='SNAPSHOT') +else: + env.Append(CPPDEFINES={"SNAPSHOT_ID": int(time.time())}) if(GetOption('save-version')): env.Append(CPPDEFINES={'SAVE_VERSION': GetOption('major-version')}) @@ -169,7 +170,7 @@ elif(GetOption('opengl-renderer')): sources=Glob("src/*.cpp") if(GetOption('win32')): - sources += env.RES('resources/powder-res.rc') + sources += env.RES('resources/powder-res.rc') sources+=Glob("src/*/*.cpp") sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/tools/*.cpp") |