Changeset 876
- Timestamp:
- Aug 29, 2011, 1:48:28 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 98 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bootstrap
r621 r876 117 117 IFS=: 118 118 tmp="$M4PATH" 119 for x in "$tmp"; do119 for x in $tmp; do 120 120 if test -n "$x"; then 121 121 aclocalflags="${aclocalflags} -I $x" -
trunk/build-mingw
r852 r876 3 3 ## Native MinGW compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net> 4 4 5 # This can't hurt 6 make distclean 7 5 8 set -e 6 9 7 10 PATH="$PATH:./contrib/gtk-2.22.1/bin" 8 M4PATH="./contrib/gtk-2.22.1/share/aclocal" 11 12 M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal" 13 M4PATH="$M4PATH:./contrib/cppunit-1.12.2/share/aclocal" 9 14 export M4PATH # This looks necessary 15 10 16 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig" 17 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/cppunit-1.12.2/lib/pkgconfig" 11 18 export PKG_CONFIG_PATH # This looks necessary, too 12 19 … … 30 37 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtkglarea-2.0.1/include" 31 38 39 # CppUnit include path 40 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/cppunit-1.12.2/include" 41 32 42 # SDL library path 33 43 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-1.2.14/lib" … … 42 52 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/bin" 43 53 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtkglarea-2.0.1/lib" 54 55 # CppUnit library path 56 LDFLAGS="$LDFLAGS -L`pwd`/contrib/cppunit-1.12.2/lib" 44 57 45 58 # Prevent issues with GTK+ internals -
trunk/build-ps3
r848 r876 2 2 3 3 ## Native PS3 compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net> 4 5 # This can't hurt 6 make distclean 4 7 5 8 set -e -
trunk/build/bitten.xml
r857 r876 13 13 ;; 14 14 windows-i386) 15 PATH="$''PATH:./contrib/gtk-2.22.1/bin" M4PATH="./contrib/gtk-2.22.1/share/aclocal" ./bootstrap; 15 PATH="$''PATH:./contrib/gtk-2.22.1/bin"; 16 M4PATH="$''M4PATH:./contrib/gtk-2.22.1/share/aclocal"; 17 M4PATH="$''M4PATH:./contrib/cppunit-1.12.2/share/aclocal"; 18 PATH="$''PATH" M4PATH="$''M4PATH" ./bootstrap; 16 19 ;; 17 20 *) … … 31 34 ;; 32 35 windows-i386) 36 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"; 37 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH:$''PWD/contrib/cppunit-1.12.2/lib/pkgconfig"; 33 38 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-1.2.14/include"; 34 39 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-image-1.2.10/include"; … … 44 49 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/atk-1.0"; 45 50 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtkglarea-2.0.1/include"; 51 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/cppunit-1.12.2/include"; 46 52 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-1.2.14/lib"; 47 53 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-image-1.2.10/lib"; … … 51 57 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/bin"; 52 58 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/gtkglarea-2.0.1/lib"; 59 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/cppunit-1.12.2/lib"; 53 60 CPPFLAGS="$''CPPFLAGS -mms-bitfields"; 54 61 LDFLAGS="$''LDFLAGS -static-libgcc -static-libstdc++"; … … 61 68 BUILDFLAGS=--build=none; 62 69 fi; 63 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH :$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig" ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS="$''CPPFLAGS" LDFLAGS="$''LDFLAGS" GTK_LIBS="$''GTK_LIBS" LOL_LIBS="$''LOL_LIBS";70 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH" ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS="$''CPPFLAGS" LDFLAGS="$''LDFLAGS" GTK_LIBS="$''GTK_LIBS" LOL_LIBS="$''LOL_LIBS"; 64 71 ;; 65 72 ps3-ppu)
Note: See TracChangeset
for help on using the changeset viewer.