From 7d4a58021f0eb0d4fb660da986037bbc3ac13d7d Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 5 Sep 2014 17:09:36 +0000 Subject: [PATCH] build: use SDL2 on Windows. --- build/autotools/m4/lol-sdl.m4 | 7 ++++++- build/lol-build | 6 +++--- build/visualstudio/Lol.Core.Vars.props | 8 ++++---- src/image/codec/gdiplus-image.cpp | 19 ++++++++++++------- src/lol/engine-internal.h | 14 +++++++------- src/lol/engine.h | 12 ++++++------ src/platform/d3d9/d3d9input.cpp | 7 +++++-- 7 files changed, 43 insertions(+), 30 deletions(-) diff --git a/build/autotools/m4/lol-sdl.m4 b/build/autotools/m4/lol-sdl.m4 index f22e9bb1..dac44501 100644 --- a/build/autotools/m4/lol-sdl.m4 +++ b/build/autotools/m4/lol-sdl.m4 @@ -84,9 +84,14 @@ if test "x${ac_cv_my_have_sdl}" = xno; then AC_CHECK_HEADERS(SDL_image.h SDL/SDL_image.h, [ac_cv_my_have_sdl_image="yes"]) AC_CHECK_LIB(SDL, main, [SDL_LIBS="${SDL_LIBS} -lSDL"], - [ac_cv_my_have_sdl="no"]) + [AC_CHECK_LIB(SDL2, main, + [SDL_LIBS="${SDL_LIBS} -lSDL2" + ac_cv_my_have_sdl2="yes"], + [ac_cv_my_have_sdl="no"])]) AC_CHECK_LIB(SDLmain, main, [SDL_LIBS="${SDL_LIBS} -lSDLmain -lSDL"]) + AC_CHECK_LIB(SDL2main, main, + [SDL_LIBS="${SDL_LIBS} -lSDL2main -lSDL2"]) AC_CHECK_LIB(SDL_mixer, main, [SDLMIXER_LIBS="${SDLMIXER_LIBS} -lSDL_mixer"], [ac_cv_my_have_sdl_mixer="no"]) diff --git a/build/lol-build b/build/lol-build index d6bb7c86..24c6df0e 100755 --- a/build/lol-build +++ b/build/lol-build @@ -168,7 +168,7 @@ configure() PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig" PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig" LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/i686-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.3/lib/i686-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/i686-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/i686-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib" @@ -193,7 +193,7 @@ configure() PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/gtkglarea-2.0.1/lib/pkgconfig" PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig" LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32" - LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/x86_64-w64-mingw32" + LDFLAGS="$LDFLAGS -L$PWD/external/sdl-2.0.3/lib/x86_64-w64-mingw32" LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/x86_64-msvc" LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/x86_64-msvc" LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32" @@ -251,7 +251,7 @@ configure() PATH="$PATH" do_configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc ;; win*-i386|win*-amd64) - CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-1.2.15/include" + CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-2.0.3/include" CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.12/include" CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.12/include" CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC" diff --git a/build/visualstudio/Lol.Core.Vars.props b/build/visualstudio/Lol.Core.Vars.props index 0b376edd..5555c367 100644 --- a/build/visualstudio/Lol.Core.Vars.props +++ b/build/visualstudio/Lol.Core.Vars.props @@ -9,15 +9,15 @@ $(FlexDir)\include - $(ExternalDir)\sdl-1.2.15 + $(ExternalDir)\sdl-2.0.3 $(ExternalDir)\sdl-image-1.2.12 $(ExternalDir)\sdl-mixer-1.2.12 $(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include $(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32 $(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc - SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib - SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib - HAVE_SDL_H;USE_SDL;$(Win32Defines) + SDL2.lib;SDL2main.lib;SDL_image.lib;SDL_mixer.lib + SDL2.lib;SDL2main.lib;SDL_image.lib;SDL_mixer.lib + HAVE_SDL_H;USE_SDL;USE_SDL2;$(Win32Defines) USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines) diff --git a/src/image/codec/gdiplus-image.cpp b/src/image/codec/gdiplus-image.cpp index d9092256..6995792c 100644 --- a/src/image/codec/gdiplus-image.cpp +++ b/src/image/codec/gdiplus-image.cpp @@ -8,16 +8,21 @@ // http://www.wtfpl.net/ for more details. // -#include - -#if defined USE_GDIPLUS - -#include +#if HAVE_CONFIG_H +# include "config.h" +#endif +#if USE_GDIPLUS +# include using std::min; using std::max; +# include +# include // for DEFINE_GUID +# include +#endif + +#include -#include -#include +#if USE_GDIPLUS #include "../../image/image-private.h" diff --git a/src/lol/engine-internal.h b/src/lol/engine-internal.h index a6ccdcbe..5c46acd1 100644 --- a/src/lol/engine-internal.h +++ b/src/lol/engine-internal.h @@ -13,28 +13,28 @@ // --------------- // -#if !defined __LOL_MAIN_H__ -#define __LOL_MAIN_H__ +#if !defined__LOL_ENGINE_INTERNAL_H__ +#define __LOL_ENGINE_INTERNAL_H__ /* Include this as early as possible */ -#if defined HAVE_CONFIG_H +#if HAVE_CONFIG_H # include "config.h" #endif /* If using NaCl or Android, override main() with our version */ -#if defined __native_client__ +#if __native_client__ # define main lol_nacl_main -#elif defined __ANDROID__ +#elif __ANDROID__ # define main lol_android_main #endif /* If using SDL on Windows or OS X, let it override main() */ -#if defined USE_SDL && (defined _WIN32 || defined __APPLE__) +#if USE_SDL && (_WIN32 || __APPLE__) # include #endif #include #include -#endif // __LOL_MAIN_H__ +#endif // __LOL_ENGINE_INTERNAL_H__ diff --git a/src/lol/engine.h b/src/lol/engine.h index 2c662e91..9c8fce6e 100644 --- a/src/lol/engine.h +++ b/src/lol/engine.h @@ -13,23 +13,23 @@ // --------------- // -#if !defined __LOL_MAIN_H__ -#define __LOL_MAIN_H__ +#if !defined __LOL_ENGINE_H__ +#define __LOL_ENGINE_H__ /* If using NaCl or Android, override main() with our version */ -#if defined __native_client__ +#if __native_client__ # define main lol_nacl_main -#elif defined __ANDROID__ +#elif __ANDROID__ # define main lol_android_main #endif /* If using SDL on Windows or OS X, let it override main() */ -#if defined USE_SDL && (defined _WIN32 || defined __APPLE__) +#if USE_SDL && (_WIN32 || __APPLE__) # include #endif #include #include -#endif // __LOL_MAIN_H__ +#endif // __LOL_ENGINE_H__ diff --git a/src/platform/d3d9/d3d9input.cpp b/src/platform/d3d9/d3d9input.cpp index 71266057..933c25b6 100644 --- a/src/platform/d3d9/d3d9input.cpp +++ b/src/platform/d3d9/d3d9input.cpp @@ -8,13 +8,16 @@ // http://www.wtfpl.net/ for more details. // -#include - +#if HAVE_CONFIG_H +# include "config.h" +#endif #if defined USE_XINPUT # include # include #endif +#include + #include "d3d9input.h" #include "input/input_internal.h"