Explorar el Código

build: update Windows SDL binaries to 1.2.15.

legacy
Sam Hocevar sam hace 12 años
padre
commit
1a118eda95
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. +3
    -3
      build/lol-build
  2. +2
    -2
      build/vs2010/Lol.Core.Vars.props

+ 3
- 3
build/lol-build Ver fichero

@@ -84,7 +84,7 @@ configure()
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
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"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/i686-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/gtk-2.22.1/lib"
@@ -109,7 +109,7 @@ configure()
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
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"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
@@ -141,7 +141,7 @@ configure()
PATH="$PATH" ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc
;;
win*-i386|win*-amd64)
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.15/include"
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
CPPFLAGS="$CPPFLAGS -I$PWD/contrib/glew-1.7.0/include/GL -DGLEW_STATIC"


+ 2
- 2
build/vs2010/Lol.Core.Vars.props Ver fichero

@@ -9,14 +9,14 @@
<FlexIncludes>$(FlexDir)\include</FlexIncludes>

<!-- SDL -->
<SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
<SdlDir>$(ContribDir)\sdl-1.2.15</SdlDir>
<SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
<SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
<SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
<SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
<SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
<SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
<SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a;winmm.lib;dxguid.lib</SdlDeps>
<SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib</SdlDeps>
<Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>

<!-- BulletPhysics -->


Cargando…
Cancelar
Guardar