From efcbf58db2e52ae1cca1d025a070cc4a62a396b3 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sat, 5 Aug 2023 15:25:33 -0300 Subject: [PATCH 1/5] update tuliphook, gets rid of keystone --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01e64129..4547bbb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,18 +96,15 @@ if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS) set(TULIP_LINK_SOURCE ON) endif() set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE) -CPMAddPackage("gh:geode-sdk/TulipHook#4369d05") +CPMAddPackage("gh:geode-sdk/TulipHook#0819bc1") set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE) # Silence warnings from dependencies include(CheckCXXCompilerFlag) check_cxx_compiler_flag(-Wno-everything SUPPORTS_W_NO_EVERYTHING) if (SUPPORTS_W_NO_EVERYTHING) - if (TARGET capstone-static) - target_compile_options(capstone-static PRIVATE -Wno-everything) - endif() - if (TARGET keystone) - target_compile_options(keystone PRIVATE -Wno-everything) + if (TARGET capstone) + target_compile_options(capstone PRIVATE -Wno-everything) endif() endif() From f5a68154d2ad11bda734900e23582c6c8549dcb5 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sat, 5 Aug 2023 15:26:41 -0300 Subject: [PATCH 2/5] fix CCControllerState using unknown byte type --- loader/include/Geode/cocos/platform/win32/CCControllerState.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/include/Geode/cocos/platform/win32/CCControllerState.h b/loader/include/Geode/cocos/platform/win32/CCControllerState.h index 7dcf8aba..3334971c 100644 --- a/loader/include/Geode/cocos/platform/win32/CCControllerState.h +++ b/loader/include/Geode/cocos/platform/win32/CCControllerState.h @@ -12,8 +12,8 @@ class CC_DLL CCControllerState public: DWORD m_packetNumber; WORD m_buttons; - byte m_leftTrigger; - byte m_rightTrigger; + unsigned char m_leftTrigger; + unsigned char m_rightTrigger; short m_thumbLX; short m_thumbLY; short m_thumbRX; From e41784ed39bf6387c95b276d7840fd12ca10f57d Mon Sep 17 00:00:00 2001 From: altalk23 <45172705+altalk23@users.noreply.github.com> Date: Sat, 5 Aug 2023 22:16:35 +0300 Subject: [PATCH 3/5] Change resources.zip to be platform dependent --- .github/workflows/build.yml | 14 +++++++++++--- .github/workflows/draft.yml | 6 ++++-- loader/src/loader/LoaderImpl.cpp | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b42a846..f91c5f45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,11 +147,18 @@ jobs: dest: geode-${{ steps.ref.outputs.hash }}-win.zip # TODO change in 2.0.0 - - name: Zip Resources + - name: Zip Windows Resources uses: vimtor/action-zip@v1.1 with: files: geode-win/resources - dest: resources.zip + dest: resources-win.zip + + # This is basically a hack because of line endings. Blame windows. + - name: Zip MacOS Resources + uses: vimtor/action-zip@v1.1 + with: + files: geode-mac/resources + dest: resources-mac.zip - name: Update Nightly Release uses: andelf/nightly-release@main @@ -167,4 +174,5 @@ jobs: ./geode-installer-${{ steps.ref.outputs.hash }}-win.exe ./geode-${{ steps.ref.outputs.hash }}-mac.zip ./geode-${{ steps.ref.outputs.hash }}-win.zip - ./resources.zip + ./resources-win.zip + ./resources-mac.zip diff --git a/.github/workflows/draft.yml b/.github/workflows/draft.yml index d6051f79..34f757d2 100644 --- a/.github/workflows/draft.yml +++ b/.github/workflows/draft.yml @@ -28,7 +28,8 @@ jobs: mv dev/geode-installer-*-win.exe geode-installer-v${{ steps.ref.outputs.version }}-win.exe mv dev/geode-*-mac.zip geode-v${{ steps.ref.outputs.version }}-mac.zip mv dev/geode-*-win.zip geode-v${{ steps.ref.outputs.version }}-win.zip - mv dev/resources.zip resources.zip + mv dev/resources-win.zip resources-win.zip + mv dev/resources-mac.zip resources-mac.zip - name: Create Draft Release uses: softprops/action-gh-release@v1 @@ -48,4 +49,5 @@ jobs: ./geode-installer-v${{ steps.ref.outputs.version }}-win.exe ./geode-v${{ steps.ref.outputs.version }}-mac.zip ./geode-v${{ steps.ref.outputs.version }}-win.zip - ./resources.zip + ./resources-win.zip + ./resources-mac.zip diff --git a/loader/src/loader/LoaderImpl.cpp b/loader/src/loader/LoaderImpl.cpp index fea23f90..44fa2f6c 100644 --- a/loader/src/loader/LoaderImpl.cpp +++ b/loader/src/loader/LoaderImpl.cpp @@ -577,7 +577,7 @@ void Loader::Impl::downloadLoaderResources(bool useLatestRelease) { .json() .then([this](json::Value const& json) { this->tryDownloadLoaderResources(fmt::format( - "https://github.com/geode-sdk/geode/releases/download/{}/resources.zip", + "https://github.com/geode-sdk/geode/releases/download/{}/resources-" GEODE_PLATFORM_SHORT_IDENTIFIER ".zip", this->getVersion().toString() ), true); }) @@ -605,7 +605,7 @@ void Loader::Impl::downloadLoaderResources(bool useLatestRelease) { // find release asset for (auto asset : root.needs("assets").iterate()) { auto obj = asset.obj(); - if (obj.needs("name").template get() == "resources.zip") { + if (obj.needs("name").template get() == "resources-" GEODE_PLATFORM_SHORT_IDENTIFIER ".zip") { this->tryDownloadLoaderResources( obj.needs("browser_download_url").template get(), false From 7b909030c9de67a01e990f99d91001d960518d67 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sat, 5 Aug 2023 16:26:13 -0300 Subject: [PATCH 4/5] update tuliphook (adds stdcall) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4547bbb9..e1db6660 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ if (PROJECT_IS_TOP_LEVEL AND NOT GEODE_BUILDING_DOCS) set(TULIP_LINK_SOURCE ON) endif() set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE) -CPMAddPackage("gh:geode-sdk/TulipHook#0819bc1") +CPMAddPackage("gh:geode-sdk/TulipHook#f77ccbe") set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE) # Silence warnings from dependencies From 4fe5076183a87b1284d96ce51f353a059811eda3 Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Sat, 5 Aug 2023 17:23:24 -0300 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7d4e242..71b01a4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Geode Changelog +## v1.1.0 + * Fix json library not actually being dynamically exported/imported (5f65d97) + * Update TulipHook, gets rid of keystone dependency and adds stdcall support (efcbf58, 7b90903) + * Make resources.zip platform dependent (e41784e) + ## v1.0.3 * Fix mod changelogs only showing Geode's own changelog (2945422) * Fix some filesystem functions for Geode running under wine (7a83354)