Changeset 949 for trunk/build


Ignore:
Timestamp:
Sep 13, 2011, 6:09:44 PM (9 years ago)
Author:
sam
Message:

build: move SDL_image and SDL_mixer binaries to an i686-only directory.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r948 r949  
    2828platform="$2"
    2929
    30 top_srcdir=$(dirname "$0")/..
    31 cd $top_srcdir
    32 top_srcdir="`pwd`"
     30__init__()
     31{
     32    top_srcdir=$(dirname "$0")/..
     33    cd $top_srcdir
     34    top_srcdir="`pwd`"
     35
     36    case "${MSYSTEM}" in
     37        MINGW32|MINGW64)
     38            PATH="$PATH:./contrib/gtk-2.22.1/bin"
     39            M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
     40            ;;
     41    esac
     42}
    3343
    3444bootstrap()
     
    4252            # No bootstrapping needed
    4353            ;;
    44         windows-i386|windows-amd64)
    45             PATH="$PATH:./contrib/gtk-2.22.1/bin"
    46             M4PATH="$M4PATH:./contrib/gtk-2.22.1/share/aclocal"
     54        *)
    4755            PATH="$PATH" M4PATH="$M4PATH" ./bootstrap
    48             ;;
    49         *)
    50             ./bootstrap
    5156            ;;
    5257    esac
     
    7075                false
    7176            fi
     77            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
    7278            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
    7379            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
     80            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
     81            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
     82            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"
     83            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/bin"
     84            LDFLAGS="$LDFLAGS -L$PWD/contrib/gtkglarea-2.0.1/lib"
    7485            ;;
    7586        windows-amd64)
     
    8596            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
    8697            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32"
     98            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
     99            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
    87100            ;;
    88101    esac
     
    96109            ;;
    97110        ps3-ppu)
    98             ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none
     111            PATH="$PATH" ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=none
    99112            ;;
    100113        windows-i386|windows-amd64)
    101             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
    102114            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
    103115            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
     
    113125            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtk-2.22.1/include/atk-1.0"
    114126            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gtkglarea-2.0.1/include"
    115             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib"
    116             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib"
    117             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"
    118             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/bin"
    119             LDFLAGS="$LDFLAGS -L$PWD/contrib/gtkglarea-2.0.1/lib"
    120127            CPPFLAGS="$CPPFLAGS -mms-bitfields"
    121128            LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
     
    123130            GTK_LIBS="$GTK_LIBS -lgtk-win32-2.0 -lgdk-win32-2.0"
    124131            GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
    125             LOL_LIBS="$LOL_LIBS -lSDL_image -lSDL_mixer -lSDLmain -lSDL -lopengl32 -lglew32"
    126             PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS" LOL_LIBS="$LOL_LIBS"
     132            PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
    127133            ;;
    128134        *)
    129             ./configure
     135            PATH="$PATH" ./configure
    130136            ;;
    131137    esac
     
    186192}
    187193
     194__init__
    188195echo "lol-build: executing action '$action' on platform '$platform'" >&2
    189196eval "$action"
Note: See TracChangeset for help on using the changeset viewer.