From 8f467d678baea5cc371a4ee5d3d8edbce6b1bfef Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sat, 16 Jan 2021 04:47:27 +0100 Subject: [PATCH] Fix build on Windows+MSVC after removing FindSDL2.cmake I updated sdl2-config.cmake in dhewm3-libs so building on Windows with them works again, however that required also a little change in dhewm3's CMakeLists.txt I also still had some uncommited changes for that fullscreen workaround that I'm committing now. --- neo/CMakeLists.txt | 1 + neo/sys/glimp.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 92bddcc8..0b844276 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -144,6 +144,7 @@ if (SDL2) find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIRS}) set(SDLx_LIBRARY ${SDL2_LIBRARIES}) + link_directories(${SDL2_LIBDIR}) else() # skip SDLmain if(APPLE OR WIN32) diff --git a/neo/sys/glimp.cpp b/neo/sys/glimp.cpp index edbb580e..f977cf2d 100644 --- a/neo/sys/glimp.cpp +++ b/neo/sys/glimp.cpp @@ -235,7 +235,7 @@ bool GLimp_Init(glimpParms_t parms) { if ((real_mode.w != parms.width) || (real_mode.h != parms.height)) { common->Warning("Current display mode isn't requested display mode\n"); - common->Warning("Likely SDL bug #4700, trying to work around it\n"); + common->Warning("Likely SDL bug #4700, trying to work around it..\n"); /* Mkay, try to hack around that. */ SDL_DisplayMode wanted_mode = {}; @@ -279,6 +279,7 @@ bool GLimp_Init(glimpParms_t parms) { return false; // trying other color depth etc is unlikely to help with this issue } + common->Warning("Now we have the requested resolution (%d x %d)\n", parms.width, parms.height); } }