diff --git a/build/bitten.xml b/build/bitten.xml index b23637c6..cf689ff1 100644 --- a/build/bitten.xml +++ b/build/bitten.xml @@ -5,18 +5,18 @@ <svn:checkout url="svn://svn.zoy.org/lolengine/" path="${path}" revision="${revision}" /> </step> <step id="bootstrap" description="Bootstrap build system"> - <sh:exec file="sh" args="-c ./build/lol-build bootstrap ${platform}"/> + <sh:exec file="./build/lol-build" args="bootstrap ${platform}"/> </step> <step id="configure" description="Configure tree"> - <sh:exec file="sh" args="-c ./build/lol-build configure ${platform}"/> + <sh:exec file="./build/lol-build" args="configure ${platform}"/> </step> <step id="build" description="Build tree"> - <sh:exec file="sh" args="-c ./build/lol-build build ${platform}"/> + <sh:exec file="./build/lol-build" args="build ${platform}"/> </step> - <step id="test" description="Run tests"> - <sh:exec file="sh" args="-c ./build/lol-build test ${platform}"/> + <step id="check" description="Run tests"> + <sh:exec file="./build/lol-build" args="check ${platform}"/> </step> <step id="clean" description="Clean tree"> - <sh:exec file="sh" args="-c ./build/lol-build clean ${platform}"/> + <sh:exec file="./build/lol-build" args="clean ${platform}"/> </step> </build> diff --git a/build/lol-build b/build/lol-build index fbf8b9a6..0d367f97 100755 --- a/build/lol-build +++ b/build/lol-build @@ -70,6 +70,7 @@ configure() false fi LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32" ;; windows-amd64) if test "x${SYSTEM}" = xMINGW64; then @@ -82,6 +83,7 @@ configure() false fi LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32" ;; esac case "$platform" in @@ -110,7 +112,6 @@ configure() CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/gdk-pixbuf-2.0" CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/atk-1.0" CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtkglarea-2.0.1/include" - LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib" LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib" LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib" LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"