drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 7 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/c_cpp_properties.json vendored
View File

@ -8,7 +8,8 @@
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include", "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include",
"${workspaceRoot}/src" "${workspaceRoot}/src",
"${workspaceRoot}/deps/ox/src"
], ],
"defines": [], "defines": [],
"intelliSenseMode": "clang-x64", "intelliSenseMode": "clang-x64",

4
.vscode/settings.json vendored
View File

@ -4,7 +4,9 @@
"ostream": "cpp", "ostream": "cpp",
"array": "cpp", "array": "cpp",
"initializer_list": "cpp", "initializer_list": "cpp",
"utility": "cpp" "utility": "cpp",
"__config": "cpp",
"__nullptr": "cpp"
}, },
"editor.insertSpaces": false, "editor.insertSpaces": false,
"editor.tabSize": 3, "editor.tabSize": 3,

12
CMakeLists.txt
View File

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

3
src/nostalgia/studio/CMakeLists.txt
View File

@ -5,7 +5,7 @@ project(nostalgia-studio)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable( add_executable(
nostalgia-studio nostalgia-studio MACOSX_BUNDLE
main.cpp main.cpp
mainwindow.cpp mainwindow.cpp
) )
@ -44,6 +44,7 @@ install(
nostalgia-studio nostalgia-studio
RUNTIME DESTINATION RUNTIME DESTINATION
${NOSTALGIA_DIST_BIN} ${NOSTALGIA_DIST_BIN}
BUNDLE DESTINATION .
) )
add_subdirectory(lib) add_subdirectory(lib)