|
Lines 1-16
Link Here
|
| 1 |
--- build.sh.orig 2007-12-11 15:26:12.000000000 +0100 |
1 |
--- ./build.sh.orig 2007-12-11 15:26:12.000000000 +0100 |
| 2 |
+++ build.sh 2007-12-13 23:24:15.000000000 +0100 |
2 |
+++ ./build.sh 2010-07-14 12:13:45.217194209 +0200 |
| 3 |
@@ -469,8 +469,8 @@ |
3 |
@@ -1,4 +1,4 @@ |
| 4 |
which wx-config |
4 |
-#!/bin/bash |
|
|
5 |
+#!/bin/sh |
| 6 |
|
| 7 |
#### Edit these options for your system |
| 8 |
|
| 9 |
@@ -44,7 +44,7 @@ |
| 10 |
|
| 11 |
if [ -z "$CYGWIN" ]; |
| 12 |
then |
| 13 |
- [ "`uname`" == "CYGWIN_NT-5.0" ] && CYGWIN="`uname`" |
| 14 |
+ [ "`uname`" = "CYGWIN_NT-5.0" ] && CYGWIN="`uname`" |
| 15 |
fi |
| 16 |
|
| 17 |
|
| 18 |
@@ -154,14 +154,14 @@ |
| 19 |
else |
| 20 |
|
| 21 |
WXVER=0 |
| 22 |
-case "`wx-config --version`" in |
| 23 |
+case "`/usr/local/bin/wxgtk2-2.8-config --version`" in |
| 24 |
2.9*|3*) |
| 25 |
echo WARNING: wxWidgets versions higher than 2.8 have not been tested. |
| 26 |
echo It might work if they are compiled with backwards compatibility. |
| 27 |
;; |
| 28 |
2.8*) ;; |
| 29 |
*) echo Could not find wxWidgets 2.8.0 or higher. |
| 30 |
- echo Please install it and ensure that wx-config is in the path |
| 31 |
+ echo Please install it and ensure that /usr/local/bin/wxgtk2-2.8-config is in the path |
| 32 |
exit 1 |
| 33 |
;; |
| 34 |
esac |
| 35 |
@@ -169,7 +169,7 @@ |
| 36 |
|
| 37 |
fi |
| 38 |
#$CYGWIN is pre-set. Cache $DARWIN so we don't have to call uname over and over. |
| 39 |
-[ "`uname`" == "Darwin" ] && DARWIN="Darwin" |
| 40 |
+[ "`uname`" = "Darwin" ] && DARWIN="Darwin" |
| 41 |
|
| 42 |
# not needed on OS X |
| 43 |
if [ -z "$DARWIN" ] |
| 44 |
@@ -190,8 +190,8 @@ |
| 45 |
# purpose of this is to avoid errors on systems that have only unicode. |
| 46 |
if [ -z "$CYGWIN" ] |
| 47 |
then |
| 48 |
- WXREL="`wx-config --release`" |
| 49 |
- if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ] |
| 50 |
+ WXREL="`/usr/local/bin/wxgtk2-2.8-config --release`" |
| 51 |
+ if [ -n "`/usr/local/bin/wxgtk2-2.8-config --list | grep $WXREL | grep unicode`" ] |
| 52 |
then |
| 53 |
WITHUNICODE="--unicode=yes" |
| 54 |
fi |
| 55 |
@@ -230,11 +230,11 @@ |
| 56 |
# if the object is older than the source, it will return true. |
| 57 |
############################################################################## |
| 58 |
|
| 59 |
-function NEEDED() |
| 60 |
+NEEDED() |
| 61 |
{ |
| 62 |
if [ -f $2 ] |
| 63 |
then |
| 64 |
- [ "`ls -tr $2 $1 2>/dev/null| tail -1`" == "$1" ] && return 0 |
| 65 |
+ [ "`ls -tr $2 $1 2>/dev/null| tail -1`" = "$1" ] && return 0 |
| 66 |
return 1 |
| 67 |
fi |
| 68 |
return 0 |
| 69 |
@@ -379,8 +379,8 @@ |
| 70 |
(OS X only, doesn't work properly elsewhere) |
| 71 |
--without-rawbitmap Disables Raw bitmap access, uses wxImage::SetRGB instead |
| 72 |
(default for non-OS X) |
| 73 |
---with-unicode Ask wx-config for a unicode build (might not yet work) |
| 74 |
---without-unicode Ask wx-config for a non-unicode build (default) |
| 75 |
+--with-unicode Ask /usr/local/bin/wxgtk2-2.8-config for a unicode build (might not yet work) |
| 76 |
+--without-unicode Ask /usr/local/bin/wxgtk2-2.8-config for a non-unicode build (default) |
| 77 |
|
| 78 |
Environment Variables you can pass: |
| 79 |
|
| 80 |
@@ -462,20 +462,20 @@ |
| 81 |
then |
| 82 |
# many thanks to David Cecchin for finding the unicode issues fixed below. |
| 83 |
|
| 84 |
- WXCONFIGFLAGS=`wx-config --cppflags $WITHUNICODE ` |
| 85 |
+ WXCONFIGFLAGS=`/usr/local/bin/wxgtk2-2.8-config --cppflags $WITHUNICODE ` |
| 86 |
if [ -z "$WXCONFIGFLAGS" ] |
| 87 |
then |
| 88 |
- echo wx-config has failed, or returned an error. Ensure that it exists in your path. |
| 89 |
- which wx-config |
| 90 |
+ echo /usr/local/bin/wxgtk2-2.8-config has failed, or returned an error. Ensure that it exists in your path. |
| 91 |
+ which /usr/local/bin/wxgtk2-2.8-config |
| 5 |
exit 3 |
92 |
exit 3 |
| 6 |
fi |
93 |
fi |
| 7 |
- CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" |
94 |
- CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" |
| 8 |
- CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" |
95 |
- CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" |
| 9 |
+ CFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" |
96 |
- LINKOPTS="`wx-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" |
| 10 |
+ CXXFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" |
97 |
+ CFLAGS="$CFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" |
| 11 |
LINKOPTS="`wx-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" |
98 |
+ CXXFLAGS="$CXXFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" |
|
|
99 |
+ LINKOPTS="`/usr/local/bin/wxgtk2-2.8-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" |
| 12 |
if [ -z "$LINKOPTS" ] |
100 |
if [ -z "$LINKOPTS" ] |
| 13 |
then |
101 |
then |
|
|
102 |
- echo wx-config has failed, or returned an error. Ensure that it exists in your path. |
| 103 |
- which wx-config |
| 104 |
+ echo /usr/local/bin/wxgtk2-2.8-config has failed, or returned an error. Ensure that it exists in your path. |
| 105 |
+ which /usr/local/bin/wxgtk2-2.8-config |
| 106 |
exit 3 |
| 107 |
fi |
| 108 |
|
| 14 |
@@ -840,7 +840,7 @@ |
109 |
@@ -840,7 +840,7 @@ |
| 15 |
#echo $CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS |
110 |
#echo $CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS |
| 16 |
if [ -z "$WITHWXUI" ] |
111 |
if [ -z "$WITHWXUI" ] |