diff options
| author | miwi <miwi@FreeBSD.org> | 2007-02-26 19:03:11 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-02-26 19:03:11 +0800 |
| commit | be24642c9e2be896f2b729bfb95b02493d693e09 (patch) | |
| tree | 1079c10981f3af14f6d8d615e906d94efd99c62d /emulators | |
| parent | f6a00fc06a472ca823c35d714f7107014ebe1b6e (diff) | |
| download | freebsd-ports-gnome-be24642c9e2be896f2b729bfb95b02493d693e09.tar.gz freebsd-ports-gnome-be24642c9e2be896f2b729bfb95b02493d693e09.tar.zst freebsd-ports-gnome-be24642c9e2be896f2b729bfb95b02493d693e09.zip | |
- Fix build problems with new scon version.
PR: 109256
Submitted by: trasz
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/nonpareil/files/patch-src_SConscript | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/emulators/nonpareil/files/patch-src_SConscript b/emulators/nonpareil/files/patch-src_SConscript index c2e97cc66f9e..c313b462469e 100644 --- a/emulators/nonpareil/files/patch-src_SConscript +++ b/emulators/nonpareil/files/patch-src_SConscript @@ -1,11 +1,6 @@ ---- src/SConscript.orig Tue Jun 28 04:53:44 2005 -+++ src/SConscript Wed Jul 26 20:37:54 2006 -@@ -37,20 +37,15 @@ - pkg_config_cmd = 'pkg-config' - pkg_config_cmd += ' --cflags --libs ' - --sdl_pkg_config_cmd = 'sdl-config --cflags --libs' -+sdl_pkg_config_cmd = 'sdl-config --cflags --libs' +--- src/SConscript.orig Tue Jun 28 09:53:44 2005 ++++ src/SConscript Sat Feb 17 14:10:33 2007 +@@ -41,16 +41,11 @@ build_env.Append (CPPPATH = ['.']) build_env.Append (CPPPATH = ['#/build/common']) # generated includes @@ -24,11 +19,10 @@ 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']) -@@ -189,46 +184,6 @@ - native_env.Append (BUILDERS = { 'Assemble': Assemble }, +@@ -190,46 +185,6 @@ UASM = uasm, UASMCOM = "$UASM $UASMFLAGS $SOURCE -o $TARGET -l ${TARGETS[1]}") -- + - -#----------------------------------------------------------------------------- -# prepare graphics @@ -68,6 +62,16 @@ - - native_env.PNG2C (target = '#build/common/lgoose_png.c', - source = 'lgoose.png') - +- #----------------------------------------------------------------------------- # prepare sounds + #----------------------------------------------------------------------------- +@@ -294,7 +249,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"}) |