cmake: collect SDL_LIBS as list + export PKG_DIRECTFB_LDFLAGS

This commit is contained in:
Anonymous Maarten
2022-06-15 17:10:31 +02:00
committed by Sam Lantinga
parent b5f1fe5004
commit 18206446bf
2 changed files with 8 additions and 6 deletions

View File

@@ -296,7 +296,7 @@ endif()
# Those are used for pkg-config and friends, so that the sdl2.pc, sdl2-config,
# etc. are created correctly.
set(SDL_LIBS "-lSDL2")
set(SDL_CFLAGS "")
set(SDL_CFLAGS )
# When building shared lib for Windows with MinGW,
# avoid the DLL having a "lib" prefix
@@ -321,7 +321,7 @@ if(CYGWIN)
list(APPEND EXTRA_LDFLAGS_BUILD "-mno-cygwin")
list(APPEND SDL_LIBS "-mno-cygwin")
endif()
set(SDL_CFLAGS "${SDL_CFLAGS} -I/usr/include/mingw")
list(APPEND SDL_CFLAGS "-I/usr/include/mingw")
endif()
# General includes
@@ -1859,7 +1859,7 @@ elseif(WINDOWS)
if(MINGW OR CYGWIN)
list(APPEND SDL_LIBS "-lmingw32" "-mwindows")
if(NOT SDL2_DISABLE_SDL2MAIN)
set(SDL_CFLAGS "${SDL_CFLAGS} -Dmain=SDL_main")
list(APPEND SDL_CFLAGS "-Dmain=SDL_main")
list(APPEND SDL_LIBS "-lSDL2main")
endif(NOT SDL2_DISABLE_SDL2MAIN)
endif()
@@ -2758,6 +2758,8 @@ Libs.private:")
listtostr(SDL_LIBS _SDL_LIBS)
set(SDL_LIBS ${_SDL_LIBS})
endif()
listtostr(SDL_CFLAGS _SDL_CFLAGS "")
set(SDL_CFLAGS ${_SDL_CFLAGS})
# MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}")
# MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}")