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 | |
| parent | e2e7f65f9fe3560b292f441504ebe36a306ac260 (diff) | |
| parent | 464897ea87f5242f4769bef36120c88ec4dbcd6c (diff) | |
Merge branch 'master' of https://github.com/Arisotura/melonDS
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 4 |
4 files changed, 9 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c18164..66d0461 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,9 @@ endif() if (CMAKE_BUILD_TYPE STREQUAL Release) add_compile_options(-O3) - add_link_options(-s) + if (NOT APPLE) + add_link_options(-s) + endif() endif() if (WIN32) @@ -99,7 +101,7 @@ if (BUILD_STATIC AND WIN32) endif() if (ENABLE_LTO) - if (WIN32) + if (WIN32 OR APPLE) add_compile_options(-flto) add_link_options(-flto) else() @@ -88,7 +88,7 @@ If everything went well, melonDS should now be in the `dist` folder. ### macOS: 1. Install the [Homebrew Package Manager](https://brew.sh) -2. Install dependencies: `brew install git pkg-config cmake sdl2 qt@5 libslirp libarchive libepoxy` +2. Install dependencies: `brew install git pkg-config cmake sdl2 qt@6 libslirp libarchive libepoxy` 3. Download the melonDS repository and prepare: ```zsh git clone https://github.com/Arisotura/melonDS @@ -97,11 +97,10 @@ If everything went well, melonDS should now be in the `dist` folder. ``` 4. Compile: ```zsh - cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON + cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DUSE_QT6=ON -DMACOS_BUNDLE_LIBS=ON make -j$(sysctl -n hw.logicalcpu) - mkdir dist && cp -r melonDS.app dist ``` -If everything went well, melonDS.app should now be in the `dist` folder. +If everything went well, melonDS.app should now be in the curent directory. ## TODO LIST diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc32b2a..c899745 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,11 +100,6 @@ if (ENABLE_JIT) endif() endif() -if (APPLE) - target_include_directories(core PUBLIC /usr/local/include /opt/homebrew/include) - target_link_directories(core PUBLIC /usr/local/lib /opt/homebrew/lib) -endif() - if (ENABLE_OGLRENDERER) find_package(PkgConfig REQUIRED) pkg_check_modules(EPOXY REQUIRED epoxy) 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() |