39 lines
1.4 KiB
Text
39 lines
1.4 KiB
Text
--- src/SConscript.orig Tue Oct 31 07:26:16 2006
|
|
+++ src/SConscript Mon Mar 26 23:12:06 2007
|
|
@@ -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'])
|
|
@@ -91,7 +86,7 @@
|
|
if build_env ['build_target_only'] == 0:
|
|
str2png_env = build_env.Copy ()
|
|
|
|
- str2png_env.Append (CPPDEFINES = {'DEFAULT_PATH': 'image'})
|
|
+ str2png_env.Append (CPPDEFINES = ['DEFAULT_PATH=image'])
|
|
|
|
str2png_srcs = Split ("""str2png.c""")
|
|
|
|
@@ -287,7 +282,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"})
|