dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-21 18:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build on Windows+MSVC after removing FindSDL2.cmake

Browse source 
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.
This commit is contained in:
Daniel Gibson 2021-01-16 04:47:27 +01:00
parent 01ac144b09
commit 8f467d678b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
neo/CMakeLists.txt
View file

@ -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)

3
neo/sys/glimp.cpp
View file

@ -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);
}
}