diff options
Diffstat (limited to 'emulators/lisaem/files/patch-build.sh')
| -rw-r--r-- | emulators/lisaem/files/patch-build.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/emulators/lisaem/files/patch-build.sh b/emulators/lisaem/files/patch-build.sh index eebea7162ab1..171bc2dc0332 100644 --- a/emulators/lisaem/files/patch-build.sh +++ b/emulators/lisaem/files/patch-build.sh @@ -1,22 +1,22 @@ ---- build.sh.orig 2007-07-10 05:23:23.000000000 +0200 -+++ build.sh 2007-09-25 08:25:06.000000000 +0200 -@@ -426,8 +426,8 @@ - then - # many thanks to David Cecchin for finding the unicode issues fixed below. - WXCONFIGFLAGS=`wx-config --cppflags --unicode=no ` +--- build.sh.orig 2007-12-11 15:26:12.000000000 +0100 ++++ build.sh 2007-12-13 23:24:15.000000000 +0100 +@@ -469,8 +469,8 @@ + which wx-config + exit 3 + fi - CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" - CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" + CFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" + CXXFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" - LINKOPTS="`wx-config $STATIC --unicode=no --libs --linkdeps --cppflags`" - [ -z "$CC" ] && CC=gcc - [ -z "$CXX" ] && CXX=g++ -@@ -768,7 +768,7 @@ - #echo $CXX $GCCSTATIC $WITHDEBUG -o lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS + LINKOPTS="`wx-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" + if [ -z "$LINKOPTS" ] + then +@@ -840,7 +840,7 @@ + #echo $CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS if [ -z "$WITHWXUI" ] then -$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS 2>&1 | head -20 +$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS 2>&1 | head -20 fi - ## if [ -n "$WITHWXUI" ] + if [ -f ../bin/lisaem ] |