yyc12345/libcmo21
1
0
Fork 0
Code Activity

fix: fix github action build error

Browse Source
This commit is contained in:
yyc12345
2026-02-03 16:47:23 +08:00
parent 37904fd5a4
commit 4985c6d3d0
11 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/zlib/linux.sh vendored
View File

@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
cmake --build . cmake --build .
cmake --install . cmake --install .
cd .. cd ..
# Back to root directory
cd ..

3
.github/scripts/zlib/macos.sh vendored
View File

@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
cmake --build . cmake --build .
cmake --install . cmake --install .
cd .. cd ..
# Back to root directory
cd ..

3
.github/scripts/zlib/windows.bat vendored
View File

@@ -15,6 +15,3 @@ cmake -A x64 -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_P
cmake --build . --config Release cmake --build . --config Release
cmake --install . --config Release cmake --install . --config Release
CD .. CD ..
:: Back to root directory
CD ..

2
.github/workflows/linux.yml vendored
View File

@@ -63,7 +63,7 @@ jobs:
name: LibCmo-linux-build name: LibCmo-linux-build
path: bin/install/* path: bin/install/*
retention-days: 30 retention-days: 30
- name: Upload Built ependencies - name: Upload Built Dependencies
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: LibCmo-linux-dep name: LibCmo-linux-dep

4
.github/workflows/macos.yml vendored
View File

@@ -58,9 +58,9 @@ jobs:
name: LibCmo-macos-build name: LibCmo-macos-build
path: bin/install/* path: bin/install/*
retention-days: 30 retention-days: 30
- name: Upload Built ependencies - name: Upload Built Dependencies
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: LibCmo-linux-dep name: LibCmo-macos-dep
path: extern/zlib/install/* path: extern/zlib/install/*
retention-days: 30 retention-days: 30

8
.github/workflows/windows.yml vendored
View File

@@ -38,8 +38,8 @@ jobs:
- name: Build ZLIB - name: Build ZLIB
shell: cmd shell: cmd
run: | run: |
CD extern/zlib CD extern\zlib
..\..\.github\scripts\zlib\windows.bat CALL ..\..\.github\scripts\zlib\windows.bat
ECHO SET ZLIB_ROOT=%ZLIB_ROOT% >> ..\envs.bat ECHO SET ZLIB_ROOT=%ZLIB_ROOT% >> ..\envs.bat
CD ..\.. CD ..\..
- name: Fetch STB - name: Fetch STB
@@ -51,8 +51,8 @@ jobs:
- name: Build STB - name: Build STB
shell: cmd shell: cmd
run: | run: |
CD extern/stb CD extern\stb
..\..\.github\scripts\stb\windows.bat CALL ..\..\.github\scripts\stb\windows.bat
ECHO SET STB_ROOT=%STB_ROOT% >> ..\envs.bat ECHO SET STB_ROOT=%STB_ROOT% >> ..\envs.bat
CD ..\.. CD ..\..
- name: Build LibCmo - name: Build LibCmo

9
Ballance/BMap/BMap/BMExports.cpp
View File

@@ -1,5 +1,6 @@
#include "BMExports.hpp" #include "BMExports.hpp"
#include <yycc.hpp> #include <yycc.hpp>
#include <yycc/carton/ironpad.hpp>
#include <set> #include <set>
#include <type_traits> #include <type_traits>
#include <memory> #include <memory>
@@ -59,8 +60,8 @@ bool BMInit() {
if (CheckInited()) return false; if (CheckInited()) return false;
// register exception handler if we are in Windows. // register exception handler if we are in Windows.
#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS) #if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
YYCC::ExceptionHelper::Register(); yycc::carton::ironpad::startup();
#endif #endif
// and startup CK environment // and startup CK environment
@@ -93,8 +94,8 @@ bool BMDispose() {
LibCmo::CK2::CKShutdown(); LibCmo::CK2::CKShutdown();
// unregister exception handler if we are in Windows // unregister exception handler if we are in Windows
#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS) #if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
YYCC::ExceptionHelper::Unregister(); yycc::carton::ironpad::shutdown();
#endif #endif
return true; return true;

3
LibCmo/LibCmo/CK2/CKGlobals.cpp
View File

@@ -11,6 +11,9 @@
#include <yycc/string/reinterpret.hpp> #include <yycc/string/reinterpret.hpp>
#include <algorithm> #include <algorithm>
#include <initializer_list> #include <initializer_list>
#include <limits>
#include <cctype>
#include <cstring>
// Import implementations. // Import implementations.
#include "ObjImpls/CKObject.hpp" #include "ObjImpls/CKObject.hpp"

12
Unvirt/Unvirt.cpp
View File

@@ -1,10 +1,22 @@
#include "UnvirtContext.hpp" #include "UnvirtContext.hpp"
#include <yycc.hpp>
#include <yycc/carton/ironpad.hpp>
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
// register exception handler if we are in Windows.
#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
yycc::carton::ironpad::startup();
#endif
// run core // run core
Unvirt::Context::UnvirtContext ctx; Unvirt::Context::UnvirtContext ctx;
ctx.Run(); ctx.Run();
// unregister exception handler if we are in Windows
#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
yycc::carton::ironpad::shutdown();
#endif
return 0; return 0;
} }

1
Unvirt/Utils.cpp
View File

@@ -1,6 +1,7 @@
#include "Utils.hpp" #include "Utils.hpp"
#include <yycc/num/op.hpp> #include <yycc/num/op.hpp>
#include <stdexcept> #include <stdexcept>
#include <algorithm>
namespace Unvirt::Utils { namespace Unvirt::Utils {

2
Unvirt/Utils.hpp
View File

@@ -1,5 +1,7 @@
#pragma once #pragma once
#include <yycc.hpp>
#include <yycc/macro/class_copy_move.hpp> #include <yycc/macro/class_copy_move.hpp>
#include <cstddef>
namespace Unvirt::Utils { namespace Unvirt::Utils {