ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #601 from nadiaholmquist/fix/msys2-sdl 

Fix build with latest MSYS2 SDL2 package
This commit is contained in:
Arisotura 2020-04-15 11:23:16 +02:00 committed by GitHub
parent 0701257546 4b57416552
commit 1b5e53f1df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libui_sdl/CMakeLists.txt
View File

@ -22,13 +22,12 @@ option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)
add_subdirectory(libui) add_subdirectory(libui)
find_package(SDL2 REQUIRED) find_package(PkgConfig REQUIRED)
include_directories(${SDL2_INCLUDE_DIR}) pkg_check_modules(SDL2 REQUIRED sdl2)
#string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
add_executable(melonDS ${SOURCES_LIBUI}) add_executable(melonDS ${SOURCES_LIBUI})
target_link_libraries(melonDS target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
core ${SDL2_LIBRARIES} libui) target_link_libraries(melonDS core libui ${SDL2_LIBRARIES})
if (UNIX) if (UNIX)
option(UNIX_PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF) option(UNIX_PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF)
@ -38,12 +37,9 @@ if (UNIX)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK3 REQUIRED gtk+-3.0) pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
pkg_check_modules(SDL2 REQUIRED sdl2)
target_include_directories(melonDS target_include_directories(melonDS PRIVATE ${GTK3_INCLUDE_DIRS})
PRIVATE ${GTK3_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS} target_link_libraries(melonDS ${GTK3_LIBRARIES})
)
target_link_libraries(melonDS ${GTK3_LIBRARIES} ${SDL2_LIBRARIES})
ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER}) ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER})
@ -63,7 +59,7 @@ if (UNIX)
elseif (WIN32) elseif (WIN32)
target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc") target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc")
target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi) target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32)
endif () endif ()
install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)