Compare commits
3 Commits
643f95ec80
...
9d1155843e
Author | SHA1 | Date | |
---|---|---|---|
9d1155843e | |||
a2139c09b2 | |||
a3e5f27ab8 |
13
Makefile
13
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:
|
||||
|
4
deps/ox/src/ox/std/anyptr.hpp
vendored
4
deps/ox/src/ox/std/anyptr.hpp
vendored
@ -58,9 +58,9 @@ class AnyPtrT {
|
||||
template<typename T>
|
||||
constexpr AnyPtrT(T *ptr) noexcept {
|
||||
if (std::is_constant_evaluated()) {
|
||||
m_wrapPtr = new Wrap(ptr);
|
||||
m_wrapPtr = new Wrap<T>(ptr);
|
||||
} else {
|
||||
m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
|
||||
m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
)
|
||||
|
@ -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;
|
@ -8,8 +8,7 @@
|
||||
|
||||
namespace studio {
|
||||
|
||||
DeleteConfirmation::DeleteConfirmation(StudioContext &ctx) noexcept:
|
||||
m_ctx{ctx} {
|
||||
DeleteConfirmation::DeleteConfirmation() noexcept {
|
||||
setTitle("Delete Item");
|
||||
}
|
||||
|
||||
|
@ -21,12 +21,11 @@ class DeleteConfirmation final: public Popup {
|
||||
Stage m_stage = Stage::Closed;
|
||||
bool m_open{};
|
||||
ox::String m_path;
|
||||
StudioContext &m_ctx;
|
||||
|
||||
public:
|
||||
ox::Signal<ox::Error(ox::StringViewCR path)> deleteFile;
|
||||
|
||||
DeleteConfirmation(StudioContext &ctx) noexcept;
|
||||
DeleteConfirmation() noexcept;
|
||||
|
||||
void openPath(ox::StringViewCR path) noexcept;
|
||||
|
||||
|
@ -40,7 +40,7 @@ class StudioUI: public ox::SignalHandler {
|
||||
BaseEditor *m_activeEditor = nullptr;
|
||||
BaseEditor *m_activeEditorUpdatePending = nullptr;
|
||||
NewMenu m_newMenu;
|
||||
DeleteConfirmation m_deleteConfirmation{m_sctx};
|
||||
DeleteConfirmation m_deleteConfirmation;
|
||||
NewProject m_newProject;
|
||||
AboutPopup m_aboutPopup;
|
||||
ox::Array<Popup*, 4> const m_popups = {
|
||||
|
Loading…
Reference in New Issue
Block a user