Changeset 876


Ignore:
Timestamp:
Aug 29, 2011, 1:48:28 PM (8 years ago)
Author:
sam
Message:

contrib: add a precompiled Win32 version of CppUnit and update build system
accordingly.

Location:
trunk
Files:
98 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/bootstrap

    r621 r876  
    117117IFS=:
    118118tmp="$M4PATH"
    119 for x in "$tmp"; do
     119for x in $tmp; do
    120120  if test -n "$x"; then
    121121    aclocalflags="${aclocalflags} -I $x"

  • trunk/build-mingw

    r852 r876  
    33##  Native MinGW compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>
    44
     5# This can't hurt
     6make distclean
     7
    58set -e
    69
    710PATH="$PATH:./contrib/gtk-2.22.1/bin"
    8 M4PATH="./contrib/gtk-2.22.1/share/aclocal"
     11
     12M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
     13M4PATH="$M4PATH:./contrib/cppunit-1.12.2/share/aclocal"
    914export M4PATH # This looks necessary
     15
    1016PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/gtkglarea-2.0.1/lib/pkgconfig"
     17PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd`/contrib/cppunit-1.12.2/lib/pkgconfig"
    1118export PKG_CONFIG_PATH # This looks necessary, too
    1219
    … …  
    3037CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/gtkglarea-2.0.1/include"
    3138
     39# CppUnit include path
     40CPPFLAGS="$CPPFLAGS -I`pwd`/contrib/cppunit-1.12.2/include"
     41
    3242# SDL library path
    3343LDFLAGS="$LDFLAGS -L`pwd`/contrib/sdl-1.2.14/lib"
    … …  
    4252LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtk-2.22.1/bin"
    4353LDFLAGS="$LDFLAGS -L`pwd`/contrib/gtkglarea-2.0.1/lib"
     54
     55# CppUnit library path
     56LDFLAGS="$LDFLAGS -L`pwd`/contrib/cppunit-1.12.2/lib"
    4457
    4558# Prevent issues with GTK+ internals

  • trunk/build-ps3

    r848 r876  
    22
    33##  Native PS3 compilation for Lol Engine -- Sam Hocevar <sam@hocevar.net>
     4
     5# This can't hurt
     6make distclean
    47
    58set -e

  • trunk/build/bitten.xml

    r857 r876  
    1313          ;;
    1414        windows-i386)
    15           PATH=&quot;$''PATH:./contrib/gtk-2.22.1/bin&quot; M4PATH=&quot;./contrib/gtk-2.22.1/share/aclocal&quot; ./bootstrap;
     15          PATH=&quot;$''PATH:./contrib/gtk-2.22.1/bin&quot;;
     16          M4PATH=&quot;$''M4PATH:./contrib/gtk-2.22.1/share/aclocal&quot;;
     17          M4PATH=&quot;$''M4PATH:./contrib/cppunit-1.12.2/share/aclocal&quot;;
     18          PATH=&quot;$''PATH&quot; M4PATH=&quot;$''M4PATH&quot; ./bootstrap;
    1619          ;;
    1720        *)
    … …  
    3134          ;;
    3235        windows-i386)
     36          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig&quot;;
     37          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/cppunit-1.12.2/lib/pkgconfig&quot;;
    3338          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/sdl-1.2.14/include&quot;;
    3439          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/sdl-image-1.2.10/include&quot;;
    … …  
    4449          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/gtk-2.22.1/include/atk-1.0&quot;;
    4550          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/gtkglarea-2.0.1/include&quot;;
     51          CPPFLAGS=&quot;$''CPPFLAGS -I$''PWD/contrib/cppunit-1.12.2/include&quot;;
    4652          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/sdl-1.2.14/lib&quot;;
    4753          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/sdl-image-1.2.10/lib&quot;;
    … …  
    5157          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/gtk-2.22.1/bin&quot;;
    5258          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/gtkglarea-2.0.1/lib&quot;;
     59          LDFLAGS=&quot;$''LDFLAGS -L$''PWD/contrib/cppunit-1.12.2/lib&quot;;
    5360          CPPFLAGS=&quot;$''CPPFLAGS -mms-bitfields&quot;;
    5461          LDFLAGS=&quot;$''LDFLAGS -static-libgcc -static-libstdc++&quot;;
    … …  
    6168            BUILDFLAGS=--build=none;
    6269          fi;
    63           PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH:$''PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig&quot; ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS=&quot;$''CPPFLAGS&quot; LDFLAGS=&quot;$''LDFLAGS&quot; GTK_LIBS=&quot;$''GTK_LIBS&quot; LOL_LIBS=&quot;$''LOL_LIBS&quot;;
     70          PKG_CONFIG_PATH=&quot;$''PKG_CONFIG_PATH&quot; ./configure $''HOSTFLAGS $''BUILDFLAGS CPPFLAGS=&quot;$''CPPFLAGS&quot; LDFLAGS=&quot;$''LDFLAGS&quot; GTK_LIBS=&quot;$''GTK_LIBS&quot; LOL_LIBS=&quot;$''LOL_LIBS&quot;;
    6471          ;;
    6572        ps3-ppu)
Note: See TracChangeset for help on using the changeset viewer.