TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-04 11:25:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add libmingw32 to SDL2pp library list on MINGW

Browse Source 
Without it, SDL2pp using apps won't compile with mingw, with undefined
reference to WinMain. More investigation is needed on what happens here,
so for now just link the library. To be noted, it's the same as FindSDL
bundled with CMake does.

See also issue #66 and http://forums.libsdl.org/viewtopic.php?p=49618
This commit is contained in:
Dmitry Marakasov 2016-01-21 20:57:05 +03:00
parent 69bb914040
commit e103c6b9f9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -13,7 +13,7 @@ environment:
PREFIX: c:\usr_msvc PREFIX: c:\usr_msvc
MSVC: MSVC:
MINGW32: rem MINGW32: rem
- CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-cc -DCMAKE_CXX_COMPILER=mingw32-c++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXE_LINKER_FLAGS="-lmingw32" -DSDL2PP_ENABLE_LIVE_TESTS=OFF -G "MinGW Makefiles" - CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-cc -DCMAKE_CXX_COMPILER=mingw32-c++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSDL2PP_ENABLE_LIVE_TESTS=OFF -G "MinGW Makefiles"
PREFIX: c:\usr_mingw32 PREFIX: c:\usr_mingw32
MINGW32: MINGW32:
MSVC: rem MSVC: rem

5
CMakeLists.txt
View File

@ -33,6 +33,11 @@ SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY})
SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) SET(SDL2_ALL_PKGCONFIG_MODULES sdl2)
SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY}) SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY})
IF(MINGW)
FIND_LIBRARY(MINGW32_LIBRARY NAMES mingw32)
SET(SDL2PP_EXTRA_LIBRARIES "${SDL2PP_EXTRA_LIBRARIES} ${MINGW32_LIBRARY}")
ENDIF(MINGW)
IF(SDL2PP_WITH_IMAGE) IF(SDL2PP_WITH_IMAGE)
FIND_PACKAGE(SDL2_image REQUIRED) FIND_PACKAGE(SDL2_image REQUIRED)
SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR}) SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR})