From 0bf06e720d305fbf0b26d57919cd1b48afb07aec Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Wed, 15 Jan 2025 21:25:58 -0600 Subject: [PATCH] Updated workflows --- .github/workflows/main.yml | 21 ++++++++++++++++----- src/port/Engine.h | 6 ++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8271b98..b04a030f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,12 +58,19 @@ jobs: uses: actions/download-artifact@v4 with: name: starship.o2r - path: ./build/x64/Release/starship.o2r + path: ./build/x64/Release + - name: Create Package + run: | + mkdir starship-release + mv build/x64/Release/Starship.exe starship-release/ + mv build/x64/Release/starship.o2r starship-release/ + mv config.json starship-release/ + mv assets starship-release/ - name: Upload build uses: actions/upload-artifact@v4 with: name: starship-windows - path: ./build/x64/Release + path: starship-release build-macos: needs: generate-port-o2r @@ -82,12 +89,14 @@ jobs: uses: actions/download-artifact@v4 with: name: starship.o2r - path: build-cmake/starship.o2r + path: ./build-cmake - name: Create Package run: | mkdir starship-release mv build-cmake/Starship starship-release/ mv build-cmake/starship.o2r starship-release/ + mv config.json starship-release/ + mv assets starship-release/ - name: Publish packaged artifacts uses: actions/upload-artifact@v4 with: @@ -127,7 +136,7 @@ jobs: uses: actions/download-artifact@v4 with: name: starship.o2r - path: build-cmake/starship.o2r + path: ./build-cmake - name: Build run: | cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release @@ -141,4 +150,6 @@ jobs: with: name: Starship-linux path: | - starship.appimage \ No newline at end of file + starship.appimage + config.json + assets \ No newline at end of file diff --git a/src/port/Engine.h b/src/port/Engine.h index ef60f012..e6cff565 100644 --- a/src/port/Engine.h +++ b/src/port/Engine.h @@ -30,20 +30,18 @@ class GameEngine { std::shared_ptr context; GameEngine(); + void StartFrame() const; static bool GenAssetFile(); static void Create(); - void StartFrame() const; static void HandleAudioThread(); - static void ProcessAudioTask(s16* audio_buffer); static void StartAudioFrame(); static void EndAudioFrame(); static void AudioInit(); static void AudioExit(); static void RunCommands(Gfx* Commands, const std::vector>& mtx_replacements); - void ProcessFrame(void (*run_one_game_iter)()) const; static void Destroy(); - static void ProcessGfxCommands(Gfx* commands); static uint32_t GetInterpolationFPS(); + static void ProcessGfxCommands(Gfx* commands); static int ShowYesNoBox(const char* title, const char* box); static void ShowMessage(const char* title, const char* message, SDL_MessageBoxFlags type = SDL_MESSAGEBOX_ERROR);