From 9d1155843e80762c96fb2b85dfeaef762a24b943 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 19 Jan 2025 01:48:53 -0600 Subject: [PATCH] [nostalgia] Rename player from 'nostalgia' to 'Nostalgia' --- Makefile | 13 ++++++------- src/nostalgia/player/CMakeLists.txt | 14 +++++++------- src/nostalgia/player/app.hpp | 8 -------- 3 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 src/nostalgia/player/app.hpp diff --git a/Makefile b/Makefile index aafb5608..5e5c49cb 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,13 @@ BUILDCORE_PATH=deps/buildcore include ${BUILDCORE_PATH}/base.mk ifeq ($(BC_VAR_OS),darwin) - PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}.app/Contents/MacOS/${BC_VAR_PROJECT_NAME} - NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio + PROJECT_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 - PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} - NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio + PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio MGBA=mgba-qt endif +PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP} .PHONY: pkg-gba pkg-gba: build @@ -20,13 +19,13 @@ pkg-gba: build .PHONY: build-player build-player: - ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME} + ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP} .PHONY: run run: build-player ${PROJECT_PLAYER} sample_project .PHONY: run-studio run-studio: build - ${NOSTALGIA_STUDIO} + ${PROJECT_STUDIO} .PHONY: gba-run gba-run: pkg-gba ${MGBA} ${BC_VAR_PROJECT_NAME}.gba @@ -35,7 +34,7 @@ debug: build ${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project .PHONY: debug-studio debug-studio: build - ${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO} + ${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO} .PHONY: configure-gba configure-gba: diff --git a/src/nostalgia/player/CMakeLists.txt b/src/nostalgia/player/CMakeLists.txt index d2609578..331df8ba 100644 --- a/src/nostalgia/player/CMakeLists.txt +++ b/src/nostalgia/player/CMakeLists.txt @@ -1,26 +1,26 @@ add_executable( - nostalgia WIN32 + Nostalgia WIN32 app.cpp ) # enable LTO if(NOT WIN32) - set_property(TARGET nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) + set_property(TARGET Nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) endif() if(COMMAND OBJCOPY_FILE) - set_target_properties(nostalgia + set_target_properties(Nostalgia PROPERTIES LINK_FLAGS ${LINKER_FLAGS} COMPILER_FLAGS "-mthumb -mthumb-interwork" ) - OBJCOPY_FILE(nostalgia) - #PADBIN_FILE(nostalgia) + OBJCOPY_FILE(Nostalgia) + #PADBIN_FILE(Nostalgia) endif() target_link_libraries( - nostalgia + Nostalgia NostalgiaKeelModules NostalgiaProfile OlympicApplib @@ -29,7 +29,7 @@ target_link_libraries( install( TARGETS - nostalgia + Nostalgia DESTINATION bin ) diff --git a/src/nostalgia/player/app.hpp b/src/nostalgia/player/app.hpp deleted file mode 100644 index 34357153..00000000 --- a/src/nostalgia/player/app.hpp +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. - */ - -#include -#include - -typename ox::Error run(ox::UniquePtr &&fs) noexcept;