From 1c17d5495e763e7cee0419864ecfd4f83c03a7ad Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 15 Feb 2020 17:40:21 +0900 Subject: [PATCH] CMake: Attempting to around SDL2 issues on macOS --- CMakeLists.txt | 22 ++++++---------------- src/duckstation-sdl/CMakeLists.txt | 7 ++++--- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bea549593..95b5a1cef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,23 +12,13 @@ endif() # Common include/library directories on Windows. if(WIN32) - set(SDL2_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/include/SDL") - if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(SDL2_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib64-debug/SDL2.lib") - set(SDL2MAIN_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib64-debug/SDL2main.lib") - else() - set(SDL2_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib32-debug/SDL2.lib") - set(SDL2MAIN_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib32-debug/SDL2main.lib") - endif() + set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/include") + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(SDL2_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib64/SDL2.lib") + set(SDL2MAIN_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib64/SDL2main.lib") else() - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(SDL2_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib64/SDL2.lib") - set(SDL2MAIN_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib64/SDL2main.lib") - else() - set(SDL2_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib32/SDL2.lib") - set(SDL2MAIN_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/lib32/SDL2main.lib") - endif() + set(SDL2_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib32/SDL2.lib") + set(SDL2MAIN_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/dep/msvc/sdl2/lib32/SDL2main.lib") endif() endif() diff --git a/src/duckstation-sdl/CMakeLists.txt b/src/duckstation-sdl/CMakeLists.txt index ad0389bac..413896a50 100644 --- a/src/duckstation-sdl/CMakeLists.txt +++ b/src/duckstation-sdl/CMakeLists.txt @@ -16,12 +16,13 @@ add_executable(duckstation-sdl sdl_settings_interface.h ) +target_include_directories(duckstation-sdl PRIVATE ${SDL2_INCLUDE_DIRS}) +target_link_libraries(duckstation-sdl PRIVATE core common imgui nativefiledialog glad simpleini ${SDL2_LIBRARIES}) + if(WIN32) target_sources(duckstation-sdl PRIVATE d3d11_host_display.cpp d3d11_host_display.h ) - target_link_libraries(duckstation-sdl PRIVATE d3d11.lib dxgi.lib winmm.lib) + target_link_libraries(duckstation-sdl PRIVATE d3d11.lib dxgi.lib winmm.lib ${SDL2MAIN_LIBRARIES}) endif() - -target_link_libraries(duckstation-sdl PRIVATE core common imgui nativefiledialog glad simpleini SDL2::Main)