Compare commits

..

3 Commits

Author SHA1 Message Date
9d1155843e [nostalgia] Rename player from 'nostalgia' to 'Nostalgia'
All checks were successful
Build / build (push) Successful in 3m24s
2025-01-19 01:48:53 -06:00
a2139c09b2 [studio] Cleanup unused member 2025-01-19 01:44:26 -06:00
a3e5f27ab8 [ox/std] Fix Mac build 2025-01-19 01:43:38 -06:00
7 changed files with 18 additions and 29 deletions

View File

@ -5,14 +5,13 @@ BUILDCORE_PATH=deps/buildcore
include ${BUILDCORE_PATH}/base.mk include ${BUILDCORE_PATH}/base.mk
ifeq ($(BC_VAR_OS),darwin) ifeq ($(BC_VAR_OS),darwin)
PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}.app/Contents/MacOS/${BC_VAR_PROJECT_NAME} PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}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 MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
else else
PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
MGBA=mgba-qt MGBA=mgba-qt
endif endif
PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
.PHONY: pkg-gba .PHONY: pkg-gba
pkg-gba: build pkg-gba: build
@ -20,13 +19,13 @@ pkg-gba: build
.PHONY: build-player .PHONY: build-player
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 .PHONY: run
run: build-player run: build-player
${PROJECT_PLAYER} sample_project ${PROJECT_PLAYER} sample_project
.PHONY: run-studio .PHONY: run-studio
run-studio: build run-studio: build
${NOSTALGIA_STUDIO} ${PROJECT_STUDIO}
.PHONY: gba-run .PHONY: gba-run
gba-run: pkg-gba gba-run: pkg-gba
${MGBA} ${BC_VAR_PROJECT_NAME}.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 ${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
.PHONY: debug-studio .PHONY: debug-studio
debug-studio: build debug-studio: build
${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO} ${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
.PHONY: configure-gba .PHONY: configure-gba
configure-gba: configure-gba:

View File

@ -58,9 +58,9 @@ class AnyPtrT {
template<typename T> template<typename T>
constexpr AnyPtrT(T *ptr) noexcept { constexpr AnyPtrT(T *ptr) noexcept {
if (std::is_constant_evaluated()) { if (std::is_constant_evaluated()) {
m_wrapPtr = new Wrap(ptr); m_wrapPtr = new Wrap<T>(ptr);
} else { } else {
m_wrapPtr = new(m_wrapData.data()) Wrap(ptr); m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
} }
} }

View File

@ -1,26 +1,26 @@
add_executable( add_executable(
nostalgia WIN32 Nostalgia WIN32
app.cpp app.cpp
) )
# enable LTO # enable LTO
if(NOT WIN32) if(NOT WIN32)
set_property(TARGET nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) set_property(TARGET Nostalgia PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif() endif()
if(COMMAND OBJCOPY_FILE) if(COMMAND OBJCOPY_FILE)
set_target_properties(nostalgia set_target_properties(Nostalgia
PROPERTIES PROPERTIES
LINK_FLAGS ${LINKER_FLAGS} LINK_FLAGS ${LINKER_FLAGS}
COMPILER_FLAGS "-mthumb -mthumb-interwork" COMPILER_FLAGS "-mthumb -mthumb-interwork"
) )
OBJCOPY_FILE(nostalgia) OBJCOPY_FILE(Nostalgia)
#PADBIN_FILE(nostalgia) #PADBIN_FILE(Nostalgia)
endif() endif()
target_link_libraries( target_link_libraries(
nostalgia Nostalgia
NostalgiaKeelModules NostalgiaKeelModules
NostalgiaProfile NostalgiaProfile
OlympicApplib OlympicApplib
@ -29,7 +29,7 @@ target_link_libraries(
install( install(
TARGETS TARGETS
nostalgia Nostalgia
DESTINATION DESTINATION
bin bin
) )

View File

@ -1,8 +0,0 @@
/*
* Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/memory.hpp>
#include <ox/fs/fs.hpp>
typename ox::Error run(ox::UniquePtr<ox::FileSystem> &&fs) noexcept;

View File

@ -8,8 +8,7 @@
namespace studio { namespace studio {
DeleteConfirmation::DeleteConfirmation(StudioContext &ctx) noexcept: DeleteConfirmation::DeleteConfirmation() noexcept {
m_ctx{ctx} {
setTitle("Delete Item"); setTitle("Delete Item");
} }

View File

@ -21,12 +21,11 @@ class DeleteConfirmation final: public Popup {
Stage m_stage = Stage::Closed; Stage m_stage = Stage::Closed;
bool m_open{}; bool m_open{};
ox::String m_path; ox::String m_path;
StudioContext &m_ctx;
public: public:
ox::Signal<ox::Error(ox::StringViewCR path)> deleteFile; ox::Signal<ox::Error(ox::StringViewCR path)> deleteFile;
DeleteConfirmation(StudioContext &ctx) noexcept; DeleteConfirmation() noexcept;
void openPath(ox::StringViewCR path) noexcept; void openPath(ox::StringViewCR path) noexcept;

View File

@ -40,7 +40,7 @@ class StudioUI: public ox::SignalHandler {
BaseEditor *m_activeEditor = nullptr; BaseEditor *m_activeEditor = nullptr;
BaseEditor *m_activeEditorUpdatePending = nullptr; BaseEditor *m_activeEditorUpdatePending = nullptr;
NewMenu m_newMenu; NewMenu m_newMenu;
DeleteConfirmation m_deleteConfirmation{m_sctx}; DeleteConfirmation m_deleteConfirmation;
NewProject m_newProject; NewProject m_newProject;
AboutPopup m_aboutPopup; AboutPopup m_aboutPopup;
ox::Array<Popup*, 4> const m_popups = { ox::Array<Popup*, 4> const m_popups = {