[nostalgia] Move nostalgia install vars to nostalgia dir CMakeLists.txt

CMakeLists.txt

@@ -28,26 +28,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 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)
-else()
-	if(UNIX)
-		set(BUILD_SHARED_LIBS ON)
-	endif()
-	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
-	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	set(NOSTALGIA_DIST_BIN       bin)
-	set(NOSTALGIA_DIST_LIB       lib)
-	set(NOSTALGIA_DIST_MODULE    lib)
-	set(NOSTALGIA_DIST_RESOURCES share)
-endif()
-
 add_subdirectory(deps/ox)
 include_directories(
 	deps/ox/src

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
 

src/nostalgia/CMakeLists.txt

@@ -1,6 +1,26 @@
 
 #project packages
 
+if(APPLE)
+	set(CMAKE_MACOSX_RPATH OFF)
+	set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
+	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)
+	endif()
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	set(NOSTALGIA_DIST_BIN       bin)
+	set(NOSTALGIA_DIST_LIB       lib)
+	set(NOSTALGIA_DIST_MODULE    lib)
+	set(NOSTALGIA_DIST_RESOURCES share)
+endif()
+
 add_subdirectory(modules)
 
 if(NOSTALGIA_BUILD_PLAYER)

src/nostalgia/studio/CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 
 install(
 	FILES
-		ns_logo128.png
+		ns.icns
 	DESTINATION
 		${NOSTALGIA_DIST_RESOURCES}/icons
 )

src/nostalgia/studio/Info.plist

@@ -9,7 +9,7 @@
 	<string>Nostalgia Studio</string>
 
 	<key>CFBundleIconFile</key>
-	<string>icons/ns_logo128.png</string>
+	<string>icons/ns.icns</string>
 
 	<key>CFBundleIdentifier</key>
 	<string>net.drinkingtea.nostalgia.studio</string>