From eb1846278bfc20ca81571587019e9844f09b8660 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 16 Dec 2023 10:35:28 -0600 Subject: [PATCH] [nostalgia/studio] Update app name --- CMakeLists.txt | 10 +++++----- Makefile | 5 +++-- src/nostalgia/studio/CMakeLists.txt | 2 +- src/nostalgia/studio/Info.plist | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a44f8d3..081d143f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) if(APPLE) set(CMAKE_MACOSX_RPATH OFF) set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") - set(NOSTALGIA_DIST_BIN nostalgia-studio.app/Contents/MacOS) - set(NOSTALGIA_DIST_LIB nostalgia-studio.app/Contents/Library) - set(NOSTALGIA_DIST_MODULE nostalgia-studio.app/Contents/Plugins) - set(NOSTALGIA_DIST_RESOURCES nostalgia-studio.app/Contents/Resources) - set(NOSTALGIA_DIST_MAC_APP_CONTENTS nostalgia-studio.app/Contents) + set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS) + set(NOSTALGIA_DIST_LIB NostalgiaStudio.app/Contents/Library) + set(NOSTALGIA_DIST_MODULE NostalgiaStudio.app/Contents/Plugins) + set(NOSTALGIA_DIST_RESOURCES NostalgiaStudio.app/Contents/Resources) + set(NOSTALGIA_DIST_MAC_APP_CONTENTS NostalgiaStudio.app/Contents) else() if(UNIX) set(BUILD_SHARED_LIBS ON) diff --git a/Makefile b/Makefile index 4174e4b1..7890a08f 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ BC_VAR_PROJECT_NAME=nostalgia +BC_VAR_PROJECT_NAME_CAP=Nostalgia BUILDCORE_PATH=deps/buildcore include ${BUILDCORE_PATH}/base.mk ifeq ($(BC_VAR_OS),darwin) - NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}-studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME}-studio + NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA else - NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}-studio + NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio MGBA=mgba-qt endif diff --git a/src/nostalgia/studio/CMakeLists.txt b/src/nostalgia/studio/CMakeLists.txt index 14d7b541..fcfefad2 100644 --- a/src/nostalgia/studio/CMakeLists.txt +++ b/src/nostalgia/studio/CMakeLists.txt @@ -28,7 +28,7 @@ endif() install( FILES - ns_logo128.png + ns.icns DESTINATION ${NOSTALGIA_DIST_RESOURCES}/icons ) diff --git a/src/nostalgia/studio/Info.plist b/src/nostalgia/studio/Info.plist index a8a86835..ef0935ea 100644 --- a/src/nostalgia/studio/Info.plist +++ b/src/nostalgia/studio/Info.plist @@ -9,7 +9,7 @@ Nostalgia Studio CFBundleIconFile - icons/ns_logo128.png + icons/ns.icns CFBundleIdentifier net.drinkingtea.nostalgia.studio