drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

Change Mac bunlde to use CMake's Mac bundle feature

Browse Source
This commit is contained in:
Gary Talent
2018-02-14 21:05:20 -06:00
parent 7e31eda638
commit 9d013ff481
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -20,8 +20,8 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
-fno-strict-aliasing
-mthumb-interwork
-mthumb
-std=c++17
)
set(CMAKE_CXX_STANDARD 17)
else()
set(CMAKE_CXX_STANDARD 14)
endif()
@ -44,11 +44,11 @@ endif()
if(APPLE)
set(CMAKE_MACOSX_RPATH OFF)
set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
set(NOSTALGIA_DIST_BIN Nostalgia.app/Contents/MacOS)
set(NOSTALGIA_DIST_LIB Nostalgia.app/Contents/Library)
set(NOSTALGIA_DIST_PLUGIN Nostalgia.app/Contents/Plugins)
set(NOSTALGIA_DIST_RESOURCES Nostalgia.app/Contents/Resources)
set(NOSTALGIA_DIST_MAC_APP_CONTENTS Nostalgia.app/Contents)
set(NOSTALGIA_DIST_BIN nostalgia-studio.app/Contents/MacOS)
set(NOSTALGIA_DIST_LIB nostalgia-studio.app/Contents/Library)
set(NOSTALGIA_DIST_PLUGIN nostalgia-studio.app/Contents/Plugins)
set(NOSTALGIA_DIST_RESOURCES nostalgia-studio.app/Contents/Resources)
set(NOSTALGIA_DIST_MAC_APP_CONTENTS nostalgia-studio.app/Contents)
else()
set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../lib/nostalgia")
if(NOT ${NOSTALGIA_QT_PATH} STREQUAL "")