diff options
| author | Arisotura <thetotalworm@gmail.com> | 2021-05-02 21:19:12 +0200 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2021-05-02 21:19:12 +0200 |
| commit | cc36f55b8ca18ea32a29ceaa96d5e9022b4af301 (patch) | |
| tree | 024778d654550c454301a5291211984fe523ef2d /src/frontend | |
| parent | e2e7f65f9fe3560b292f441504ebe36a306ac260 (diff) | |
| parent | 464897ea87f5242f4769bef36120c88ec4dbcd6c (diff) | |
Merge branch 'master' of https://github.com/Arisotura/melonDS
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index c2e53c4..05dce4a 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -82,7 +82,7 @@ endif() target_link_libraries(melonDS ${CMAKE_THREAD_LIBS_INIT}) -target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS} ${SLIRP_INCLUDE_DIRS} ${LIBARCHIVE_INCLUDE_DIRS}) +target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS} ${SDL2_PREFIX}/include ${SLIRP_INCLUDE_DIRS} ${LIBARCHIVE_INCLUDE_DIRS}) target_link_directories(melonDS PRIVATE ${SDL2_LIBRARY_DIRS} ${SLIRP_LIBRARY_DIRS}) target_link_directories(melonDS PRIVATE ${LIBARCHIVE_LIBRARY_DIRS}) @@ -136,7 +136,7 @@ if (APPLE) set_source_files_properties("${CMAKE_SOURCE_DIR}/melon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # Qt 6 requires macOS 10.15 if building on 10.15 or greater - if(CMAKE_SYSTEM_VERSION VERSION_GREATER 18.5.0) + if(CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 19.0.0) if (USE_QT6) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) endif() |