30 lines
1.1 KiB
Text
30 lines
1.1 KiB
Text
--- src/SConscript.orig 2008-08-24 09:37:18.000000000 +0900
|
|
+++ src/SConscript 2011-03-20 05:12:10.000000000 +0900
|
|
@@ -41,16 +41,11 @@
|
|
|
|
build_env.Append (CPPPATH = ['.'])
|
|
build_env.Append (CPPPATH = ['#/build/common']) # generated includes
|
|
-build_env.Append (CCFLAGS = ['-Wall'])
|
|
+build_env.Append (CCFLAGS = "%%CFLAGS%%")
|
|
build_env.Append (YACCFLAGS = [ '-d', '-v' ])
|
|
-
|
|
-if build_env ['debug'] :
|
|
- build_env.Append (CCFLAGS = ['-g'])
|
|
-else:
|
|
- build_env.Append (CCFLAGS = ['-O2'])
|
|
+build_env.Replace (CC = '%%CC%%')
|
|
|
|
if cross and ming and build_target_only:
|
|
- build_env.Replace (CC = '/usr/local/mingw/bin/i586-mingw32msvc-gcc')
|
|
build_env.Append (CCFLAGS = ['-mms-bitfields'])
|
|
build_env.Append (CPPPATH = ['/usr/local/gtkwin/include']) # libpng
|
|
build_env.Append (CPPPATH = ['/usr/local/gtkwin/SDL-1.2.8/include'])
|
|
@@ -286,7 +281,7 @@
|
|
|
|
csim_env = nonpareil_env.Copy ()
|
|
if not ming:
|
|
- csim_env.Append (CPPDEFINES = [('DEFAULT_PATH', build_env ['libdir'])])
|
|
+ csim_env.Append (CPPDEFINES = [('DEFAULT_PATH' + build_env ['libdir'])])
|
|
|
|
if build_env ['target'] == 'win32':
|
|
csim_env.Append (CPPDEFINES = [('SHAPE_DEFAULT', "false")])
|