Changeset 945
- Timestamp:
- Sep 10, 2011, 9:33:10 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r942 r945 41 41 win32/*.sdf 42 42 win32/*.suo 43 # Android cruft 44 monsterz/android/assets 43 45 # Do not exclude anything in contrib; this is currently one level 44 46 # more than our current max -
trunk/Makefile.am
r938 r945 3 3 DIST_SUBDIRS = $(SUBDIRS) 4 4 5 EXTRA_DIST = bootstrap build-linux build-mingw 5 EXTRA_DIST = bootstrap build-linux build-mingw build-mingw64 build-ps3 build/lol-build 6 6 AUTOMAKE_OPTIONS = dist-bzip2 7 7 -
trunk/build-mingw
r944 r945 1 1 #!/bin/sh 2 3 ## Native MinGW compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>4 2 5 3 # This can't hurt 6 4 make distclean 7 5 8 set -e 6 ./build/lol-build bootstrap windows-i386 7 ./build/lol-build configure windows-i386 8 ./build/lol-build build windows-i386 9 9 10 PATH="$PATH:./contrib/gtk-2.22.1/bin"11 12 M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"13 export M4PATH # This looks necessary14 15 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig"16 export PKG_CONFIG_PATH # This looks necessary, too17 18 # SDL include path19 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-1.2.14/include"20 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-image-1.2.10/include"21 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-mixer-1.2.11/include"22 23 # Glew include path24 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/glew-1.7.0/include -DGLEW_STATIC"25 26 # GTK include path27 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/lib/glib-2.0/include"28 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/lib/gtk-2.0/include"29 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/glib-2.0"30 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/gtk-2.0"31 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/cairo"32 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/pango-1.0"33 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"34 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/atk-1.0"35 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtkglarea-2.0.1/include"36 37 # SDL library path38 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-1.2.14/lib"39 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-image-1.2.10/lib"40 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-mixer-1.2.11/lib"41 42 # Glew library path43 LDFLAGS="$LDFLAGS -L`pwd`/contrib/glew-1.7.0/lib/i686-w64-mingw32"44 45 # GTK library path46 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/lib"47 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/bin"48 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtkglarea-2.0.1/lib"49 50 # Prevent issues with GTK+ internals51 CPPFLAGS="$CPPFLAGS -mms-bitfields"52 53 # We don't want our binaries to depend on MinGW54 LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"55 56 # Help our build scripts a bit here57 GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32"58 GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"59 GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"60 61 LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"62 63 # Bootstrap, configure and make64 ./bootstrap65 # Only on Windows66 if test "x${MSYSTEM}" != xMINGW32; then67 HOSTFLAGS=--host=i686-w64-mingw3268 BUILDFLAGS=--build=none69 fi70 71 ./configure $HOSTFLAGS $BUILDFLAGS \72 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" \73 GTK_LIBS="$GTK_LIBS" LOL_LIBS="$LOL_LIBS"74 make -j675 -
trunk/build-mingw64
r944 r945 1 1 #!/bin/sh 2 3 ## Native MinGW compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>4 2 5 3 # This can't hurt 6 4 make distclean 7 5 8 set -e 6 ./build/lol-build bootstrap windows-amd64 7 ./build/lol-build configure windows-amd64 8 ./build/lol-build build windows-amd64 9 9 10 PATH="$PATH:./contrib/gtk-2.22.1/bin"11 12 M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"13 export M4PATH # This looks necessary14 15 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig"16 export PKG_CONFIG_PATH # This looks necessary, too17 18 # SDL include path19 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-1.2.14/include"20 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-image-1.2.10/include"21 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/sdl-mixer-1.2.11/include"22 23 # Glew include path24 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/glew-1.7.0/include -DGLEW_STATIC"25 26 # GTK include path27 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/lib/glib-2.0/include"28 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/lib/gtk-2.0/include"29 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/glib-2.0"30 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/gtk-2.0"31 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/cairo"32 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/pango-1.0"33 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"34 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtk-2.22.1/include/atk-1.0"35 CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtkglarea-2.0.1/include"36 37 # SDL library path38 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-1.2.14/lib"39 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-image-1.2.10/lib"40 LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-mixer-1.2.11/lib"41 42 # Glew library path43 LDFLAGS="$LDFLAGS -L`pwd`/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"44 45 # GTK library path46 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/lib"47 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/bin"48 LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtkglarea-2.0.1/lib"49 50 # Prevent issues with GTK+ internals51 CPPFLAGS="$CPPFLAGS -mms-bitfields"52 53 # We don't want our binaries to depend on MinGW54 LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"55 56 # Help our build scripts a bit here57 GTK_LIBS="$GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32"58 GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"59 GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"60 61 LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"62 63 # Bootstrap, configure and make64 ./bootstrap65 # Only on Windows66 if test "x${MSYSTEM}" != xMINGW32; then67 HOSTFLAGS=--host=x86_64-w64-mingw3268 BUILDFLAGS=--build=none69 fi70 71 ./configure $HOSTFLAGS $BUILDFLAGS \72 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" \73 GTK_LIBS="$GTK_LIBS" LOL_LIBS="$LOL_LIBS"74 make -j675 -
trunk/build-ps3
r876 r945 1 1 #!/bin/sh 2 3 ## Native PS3 compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>4 2 5 3 # This can't hurt 6 4 make distclean 7 5 8 set -e 6 ./build/lol-build bootstrap ps3-ppu 7 ./build/lol-build configure ps3-ppu 8 ./build/lol-build build ps3-ppu 9 9 10 # Only on Windows11 if test "x${MSYSTEM}" = xMINGW32; then12 PATH="$PATH:./contrib/gtk-2.22.1/bin"13 M4PATH="./contrib/gtk-2.22.1/share/aclocal"14 export M4PATH # This looks necessary15 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig"16 export PKG_CONFIG_PATH # This looks necessary, too17 fi18 19 # Bootstrap, configure and make20 # NOTE: ensure that $CELL_SDK is set and ppu-lv2-g++ is in the path21 ./bootstrap22 ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none23 make -j624 -
trunk/build/bitten.xml
r912 r945 3 3 xmlns:c="http://bitten.edgewall.org/tools/c"> 4 4 <step id="checkout" description="Checkout source from repository"> 5 <svn:checkout url="svn://svn.zoy.org/lolengine/" 6 path="${path}" revision="${revision}" /> 5 <svn:checkout url="svn://svn.zoy.org/lolengine/" path="${path}" revision="${revision}" /> 7 6 </step> 8 7 <step id="bootstrap" description="Bootstrap build system"> 9 <sh:exec file="sh" args="-c ' 10 case ${platform} in 11 android-arm|ios-arm) 12 : ; 13 ;; 14 windows-i386) 15 PATH="$''PATH:./contrib/gtk-2.22.1/bin"; 16 M4PATH="$''M4PATH:./contrib/gtk-2.22.1/share/aclocal"; 17 PATH="$''PATH" M4PATH="$''M4PATH" ./bootstrap; 18 ;; 19 *) 20 ./bootstrap 21 ;; 22 esac 23 '"/> 8 <sh:exec file="sh" args="-c ./build/lol-build bootstrap ${platform}"/> 24 9 </step> 25 10 <step id="configure" description="Configure tree"> 26 <sh:exec file="sh" args="-c ' 27 case ${platform} in 28 android-arm) 29 cd monsterz/android && android update project --path . || exit 1; 30 ;; 31 ios-arm) 32 : ; 33 ;; 34 windows-i386) 35 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"; 36 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-1.2.14/include"; 37 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-image-1.2.10/include"; 38 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/sdl-mixer-1.2.11/include"; 39 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/glew-1.6.0/include -DGLEW_STATIC"; 40 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/lib/glib-2.0/include"; 41 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/lib/gtk-2.0/include"; 42 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/glib-2.0"; 43 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/gtk-2.0"; 44 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/cairo"; 45 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/pango-1.0"; 46 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0"; 47 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/atk-1.0"; 48 CPPFLAGS="$''CPPFLAGS -I$''PWD/contrib/gtkglarea-2.0.1/include"; 49 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-1.2.14/lib"; 50 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-image-1.2.10/lib"; 51 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/sdl-mixer-1.2.11/lib"; 52 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/glew-1.6.0/lib"; 53 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/lib"; 54 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/bin"; 55 LDFLAGS="$''LDFLAGS -L$''PWD/contrib/gtkglarea-2.0.1/lib"; 56 CPPFLAGS="$''CPPFLAGS -mms-bitfields"; 57 LDFLAGS="$''LDFLAGS -static-libgcc -static-libstdc++"; 58 GTK_LIBS="$''GTK_LIBS -lgtkgl-2.0 -lopengl32 -lglew32 -lgdi32"; 59 GTK_LIBS="$''GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"; 60 GTK_LIBS="$''GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"; 61 LOL_LIBS="$''LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"; 62 if test "x$''{MSYSTEM}" != xMINGW32; then 63 HOSTFLAGS=--host=i586-mingw32msvc; 64 BUILDFLAGS=--build=none; 65 fi; 66 PKG_CONFIG_PATH="$''PKG_CONFIG_PATH" ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS="$''CPPFLAGS" LDFLAGS="$''LDFLAGS" GTK_LIBS="$''GTK_LIBS" LOL_LIBS="$''LOL_LIBS"; 67 ;; 68 ps3-ppu) 69 if test -f build-ps3; then ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none; fi; 70 ;; 71 *) 72 ./configure; 73 ;; 74 esac 75 '"/> 11 <sh:exec file="sh" args="-c ./build/lol-build configure ${platform}"/> 76 12 </step> 77 13 <step id="build" description="Build tree"> 78 <sh:exec file="sh" args="-c ' 79 case ${platform} in 80 android-arm) 81 cd monsterz/android || exit 1; 82 ndk-build || exit 1; 83 ant compile || exit 1; 84 ;; 85 ios-arm) 86 cd monsterz/ios && xcodebuild -configuration Release -sdk iphonesimulator4.3; 87 ;; 88 ps3-ppu) 89 if test -f build-ps3; then make || exit 1; else cd monsterz/ps3 && make || exit 1; fi ; 90 ;; 91 *) 92 make; 93 ;; 94 esac 95 '"/> 14 <sh:exec file="sh" args="-c ./build/lol-build build ${platform}"/> 96 15 </step> 97 16 <step id="test" description="Run tests"> 98 <sh:exec file="sh" args="-c ' 99 case ${platform} in 100 android-arm|ios-arm|ps3-ppu) : ; ;; 101 *) make check; ;; 102 esac 103 '"/> 17 <sh:exec file="sh" args="-c ./build/lol-build test ${platform}"/> 104 18 </step> 105 19 <step id="clean" description="Clean tree"> 106 <sh:exec file="sh" args="-c ' 107 case ${platform} in 108 android-arm) 109 : ; 110 ;; 111 ios-arm) 112 cd monsterz/ios && xcodebuild -configuration Release -sdk iphonesimulator4.3 clean; 113 ;; 114 ps3-ppu) 115 if test -f build-ps3; then make distclean || exit 1; fi ; 116 ;; 117 *) 118 make distclean; 119 ;; 120 esac 121 '"/> 20 <sh:exec file="sh" args="-c ./build/lol-build clean ${platform}"/> 122 21 </step> 123 22 </build> -
trunk/test/Makefile.am
r942 r945 5 5 ./benchsuite$(EXEEXT) 6 6 7 all-local: quad$(EXEEXT) benchsuite$(EXEEXT)7 all-local: $(noinst_PROGRAMS) 8 8 test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self 9 9 test x$(MAKE_FSELF) = xno || make_fself sandbox$(EXEEXT) sandbox.self … … 12 12 13 13 CLEANFILES = $(noinst_PROGRAMS:%=%.self) $(noinst_PROGRAMS:%=%.exe) 14 #quad.self sandbox.self benchsuite.self testsuite.self \15 # quad.exe sandbox.exe benchsuite.exe testsuite.exe16 14 17 15 noinst_PROGRAMS = quad sandbox benchsuite testsuite
Note: See TracChangeset
for help on using the changeset viewer.