diff --git a/deps/nostalgia/Makefile b/deps/nostalgia/Makefile index 7890a08..90c6529 100644 --- a/deps/nostalgia/Makefile +++ b/deps/nostalgia/Makefile @@ -1,5 +1,6 @@ BC_VAR_PROJECT_NAME=nostalgia BC_VAR_PROJECT_NAME_CAP=Nostalgia +BC_VAR_DEVENV_ROOT=util BUILDCORE_PATH=deps/buildcore include ${BUILDCORE_PATH}/base.mk @@ -13,7 +14,7 @@ endif .PHONY: pkg-gba pkg-gba: build - ${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME} + ${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME} .PHONY: run run: build diff --git a/deps/nostalgia/deps/glad/CMakeLists.txt b/deps/nostalgia/deps/glad/CMakeLists.txt index 740bd51..ea904c9 100644 --- a/deps/nostalgia/deps/glad/CMakeLists.txt +++ b/deps/nostalgia/deps/glad/CMakeLists.txt @@ -1,2 +1,11 @@ -add_library(glad OBJECT src/glad.c) -target_include_directories(glad PUBLIC include) \ No newline at end of file +add_library(glad src/glad.c) + +target_include_directories(glad PUBLIC include) + +install( + TARGETS + glad + DESTINATION + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/deps/nostalgia/deps/imgui/CMakeLists.txt b/deps/nostalgia/deps/imgui/CMakeLists.txt index 3fbdb9e..9fab8c0 100644 --- a/deps/nostalgia/deps/imgui/CMakeLists.txt +++ b/deps/nostalgia/deps/imgui/CMakeLists.txt @@ -6,7 +6,7 @@ endif() # DrinkingTea: end add_library( - imgui OBJECT + imgui imgui.cpp imgui_demo.cpp imgui_draw.cpp @@ -19,4 +19,12 @@ add_library( target_include_directories( imgui SYSTEM PUBLIC . -) \ No newline at end of file +) + +install( + TARGETS + imgui + DESTINATION + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/deps/nostalgia/src/olympic/turbine/src/glfw/turbine.cpp b/deps/nostalgia/src/olympic/turbine/src/glfw/turbine.cpp index 91147c2..d814823 100644 --- a/deps/nostalgia/src/olympic/turbine/src/glfw/turbine.cpp +++ b/deps/nostalgia/src/olympic/turbine/src/glfw/turbine.cpp @@ -50,6 +50,7 @@ ox::Result init( glfwInit(); OX_RETURN_ERROR(initGfx(*ctx)); glfwSetWindowSizeCallback(ctx->window, draw); + ctx->mandatoryRefreshPeriodEnd = ticksMs(*ctx) + config::MandatoryRefreshPeriod; return ox::UPtr(ctx.release()); } diff --git a/deps/nostalgia/Dockerfile b/deps/nostalgia/util/Dockerfile similarity index 99% rename from deps/nostalgia/Dockerfile rename to deps/nostalgia/util/Dockerfile index 702ff5e..2681785 100644 --- a/deps/nostalgia/Dockerfile +++ b/deps/nostalgia/util/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:41 RUN dnf update -y diff --git a/deps/nostalgia/devenv/entrypoint.sh b/deps/nostalgia/util/devenv/entrypoint.sh similarity index 100% rename from deps/nostalgia/devenv/entrypoint.sh rename to deps/nostalgia/util/devenv/entrypoint.sh diff --git a/deps/nostalgia/devenv/pacman.conf b/deps/nostalgia/util/devenv/pacman.conf similarity index 100% rename from deps/nostalgia/devenv/pacman.conf rename to deps/nostalgia/util/devenv/pacman.conf diff --git a/deps/nostalgia/devenv/sudoers b/deps/nostalgia/util/devenv/sudoers similarity index 100% rename from deps/nostalgia/devenv/sudoers rename to deps/nostalgia/util/devenv/sudoers diff --git a/deps/nostalgia/scripts/pkg-gba.py b/deps/nostalgia/util/scripts/pkg-gba.py similarity index 100% rename from deps/nostalgia/scripts/pkg-gba.py rename to deps/nostalgia/util/scripts/pkg-gba.py