fix: fix github action build error
This commit is contained in:
3
.github/scripts/zlib/linux.sh
vendored
3
.github/scripts/zlib/linux.sh
vendored
@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
|
||||
cmake --build .
|
||||
cmake --install .
|
||||
cd ..
|
||||
|
||||
# Back to root directory
|
||||
cd ..
|
||||
|
||||
3
.github/scripts/zlib/macos.sh
vendored
3
.github/scripts/zlib/macos.sh
vendored
@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
|
||||
cmake --build .
|
||||
cmake --install .
|
||||
cd ..
|
||||
|
||||
# Back to root directory
|
||||
cd ..
|
||||
|
||||
3
.github/scripts/zlib/windows.bat
vendored
3
.github/scripts/zlib/windows.bat
vendored
@@ -15,6 +15,3 @@ cmake -A x64 -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_P
|
||||
cmake --build . --config Release
|
||||
cmake --install . --config Release
|
||||
CD ..
|
||||
|
||||
:: Back to root directory
|
||||
CD ..
|
||||
|
||||
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@@ -63,7 +63,7 @@ jobs:
|
||||
name: LibCmo-linux-build
|
||||
path: bin/install/*
|
||||
retention-days: 30
|
||||
- name: Upload Built ependencies
|
||||
- name: Upload Built Dependencies
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: LibCmo-linux-dep
|
||||
|
||||
4
.github/workflows/macos.yml
vendored
4
.github/workflows/macos.yml
vendored
@@ -58,9 +58,9 @@ jobs:
|
||||
name: LibCmo-macos-build
|
||||
path: bin/install/*
|
||||
retention-days: 30
|
||||
- name: Upload Built ependencies
|
||||
- name: Upload Built Dependencies
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: LibCmo-linux-dep
|
||||
name: LibCmo-macos-dep
|
||||
path: extern/zlib/install/*
|
||||
retention-days: 30
|
||||
8
.github/workflows/windows.yml
vendored
8
.github/workflows/windows.yml
vendored
@@ -38,8 +38,8 @@ jobs:
|
||||
- name: Build ZLIB
|
||||
shell: cmd
|
||||
run: |
|
||||
CD extern/zlib
|
||||
..\..\.github\scripts\zlib\windows.bat
|
||||
CD extern\zlib
|
||||
CALL ..\..\.github\scripts\zlib\windows.bat
|
||||
ECHO SET ZLIB_ROOT=%ZLIB_ROOT% >> ..\envs.bat
|
||||
CD ..\..
|
||||
- name: Fetch STB
|
||||
@@ -51,8 +51,8 @@ jobs:
|
||||
- name: Build STB
|
||||
shell: cmd
|
||||
run: |
|
||||
CD extern/stb
|
||||
..\..\.github\scripts\stb\windows.bat
|
||||
CD extern\stb
|
||||
CALL ..\..\.github\scripts\stb\windows.bat
|
||||
ECHO SET STB_ROOT=%STB_ROOT% >> ..\envs.bat
|
||||
CD ..\..
|
||||
- name: Build LibCmo
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "BMExports.hpp"
|
||||
#include <yycc.hpp>
|
||||
#include <yycc/carton/ironpad.hpp>
|
||||
#include <set>
|
||||
#include <type_traits>
|
||||
#include <memory>
|
||||
@@ -59,8 +60,8 @@ bool BMInit() {
|
||||
if (CheckInited()) return false;
|
||||
|
||||
// register exception handler if we are in Windows.
|
||||
#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS)
|
||||
YYCC::ExceptionHelper::Register();
|
||||
#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
|
||||
yycc::carton::ironpad::startup();
|
||||
#endif
|
||||
|
||||
// and startup CK environment
|
||||
@@ -93,8 +94,8 @@ bool BMDispose() {
|
||||
LibCmo::CK2::CKShutdown();
|
||||
|
||||
// unregister exception handler if we are in Windows
|
||||
#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS)
|
||||
YYCC::ExceptionHelper::Unregister();
|
||||
#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
|
||||
yycc::carton::ironpad::shutdown();
|
||||
#endif
|
||||
|
||||
return true;
|
||||
|
||||
@@ -11,6 +11,9 @@
|
||||
#include <yycc/string/reinterpret.hpp>
|
||||
#include <algorithm>
|
||||
#include <initializer_list>
|
||||
#include <limits>
|
||||
#include <cctype>
|
||||
#include <cstring>
|
||||
|
||||
// Import implementations.
|
||||
#include "ObjImpls/CKObject.hpp"
|
||||
|
||||
@@ -1,10 +1,22 @@
|
||||
#include "UnvirtContext.hpp"
|
||||
#include <yycc.hpp>
|
||||
#include <yycc/carton/ironpad.hpp>
|
||||
|
||||
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
|
||||
Unvirt::Context::UnvirtContext ctx;
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "Utils.hpp"
|
||||
#include <yycc/num/op.hpp>
|
||||
#include <stdexcept>
|
||||
#include <algorithm>
|
||||
|
||||
namespace Unvirt::Utils {
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
#include <yycc.hpp>
|
||||
#include <yycc/macro/class_copy_move.hpp>
|
||||
#include <cstddef>
|
||||
|
||||
namespace Unvirt::Utils {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user