--stable and --python-ver options

1 files changed, 9 insertions, 3 deletions

diff --git a/SConscript b/SConscript
index e10bdf6..e1bdede 100644
--- a/SConscript
+++ b/SConscript
@@ -34,6 +34,7 @@ AddOption('--rpi',dest="rpi",action='store_true',default=False,help="Raspbain pl
 AddOption('--64bit',dest="_64bit",action='store_true',default=False,help="64-bit platform target")
 AddOption('--static',dest="static",action="store_true",default=False,help="Static linking, reduces external library dependancies but increased file size")
 AddOption('--pthreadw32-static',dest="ptw32-static",action="store_true",default=False,help="Use PTW32_STATIC_LIB for pthreadw32 headers")
+AddOption('--python-ver',dest="pythonver",default=False,help="Python version to use for generator.py")
 AddOption('--release',dest="release",action='store_true',default=False,help="Enable optimisations (Will slow down compiling)")
 AddOption('--lua-dir',dest="lua-dir",default=False,help="Directory for lua includes")
 AddOption('--sdl-dir',dest="sdl-dir",default=False,help="Directory for SDL includes")
@@ -50,6 +51,7 @@ AddOption('--minor-version',dest="minor-version",default=False,help="Minor versi
 AddOption('--build-number',dest="build-number",default=False,help="Build number.")
 AddOption('--snapshot',dest="snapshot",action='store_true',default=False,help="Snapshot build.")
 AddOption('--snapshot-id',dest="snapshot-id",default=False,help="Snapshot build ID.")
+AddOption('--stable',dest="stable",default=True,help="Non snapshot build")
 
 AddOption('--aao', dest="everythingAtOnce", action='store_true', default=False, help="Compile the whole game without generating intermediate objects (very slow), enable this when using compilers like clang or mscc that don't support -fkeep-inline-functions")
 
@@ -197,7 +199,7 @@ if(GetOption('beta')):
 	env.Append(CPPDEFINES='BETA')
 
 
-if(not GetOption('snapshot') and not GetOption('beta') and not GetOption('release')):
+if(not GetOption('snapshot') and not GetOption('beta') and not GetOption('release') and not GetOption('stable')):
 	env.Append(CPPDEFINES='SNAPSHOT_ID=0')
 	env.Append(CPPDEFINES='SNAPSHOT')
 elif(GetOption('snapshot') or GetOption('snapshot-id')):
@@ -206,6 +208,8 @@ elif(GetOption('snapshot') or GetOption('snapshot-id')):
 	else:
 		env.Append(CPPDEFINES=['SNAPSHOT_ID=' + str(int(time.time()))])
 	env.Append(CPPDEFINES='SNAPSHOT')
+elif(GetOption('stable')):
+	env.Append(CPPDEFINES='STABLE')
 
 if(GetOption('save-version')):
 	env.Append(CPPDEFINES=['SAVE_VERSION=' + GetOption('save-version')])
@@ -289,8 +293,10 @@ if(GetOption('release')):
 	else:
 		env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wunsafe-loop-optimizations'])
 
-        
-if(GetOption('lin')):
+
+if(GetOption('pythonver')):
+	pythonVer = GetOption('pythonver')
+elif(GetOption('lin')):
 	pythonVer = "python2"
 else:
 	pythonVer = "python"