Skip to content

Commit

Permalink
fix: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
OEOTYAN committed Aug 11, 2024
1 parent ef4e4f8 commit b4b8fdf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
strategy:
fail-fast: false
matrix:
# target-type:
# - server
# - client
target_type:
- server
- client
mode:
- debug
- release
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
xmake repo -u
- run: |
xmake f -a x64 -m ${{ matrix.mode }} -p windows -v -y --use_mimalloc=${{ matrix.use_mimalloc }}
xmake f -a x64 -m ${{ matrix.mode }} -p windows -v -y --use_mimalloc=${{ matrix.use_mimalloc }} --target_type=${{ matrix.target_type }}
- run: |
xmake -v -w -y
Expand All @@ -63,7 +63,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: levilamina-${{ matrix.mode }}${{ matrix.use_mimalloc == false && '-nonmimalloc' || '' }}-windows-x64-${{ github.sha }}
name: levilamina-${{ matrix.target_type }}-${{ matrix.mode }}${{ matrix.use_mimalloc == false && '-nonmimalloc' || '' }}-windows-x64-${{ github.sha }}
path: |
bin/
Expand Down
2 changes: 1 addition & 1 deletion src-server/ll/core/tweak/ModifyInfomation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ LL_STATIC_HOOK(
char const* pszFormat,
char* va
) {
if (ll::getLeviConfig().modules.tweak.disableAutoCompactionLog
if (ll::getLeviConfig().modules.targeted.disableAutoCompactionLog
&& std::string_view{func}.starts_with("DBStorage::_scheduleNextAutoCompaction")) {
static_assert(&DBStorage::_scheduleNextAutoCompaction); // make sure function exist
return;
Expand Down
8 changes: 4 additions & 4 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if has_config("tests") then
add_requires("gtest")
end

if is_config("target-type", "client") then
if is_config("target_type", "client") then
add_requires("imgui v1.91.0-docking", {configs = {dx11 = true, dx12 = true}})
end

Expand All @@ -44,13 +44,13 @@ option("use_mimalloc")
set_showmenu(true)
set_description("Enable mimalloc")

option("target-type")
option("target_type")
set_default("server")
set_showmenu(true)
set_values("server", "client")
option_end()

if is_config("target-type", "server") then
if is_config("target_type", "server") then
set_defaultarchs("windows|x64")
set_allowedarchs("windows|x64", "linux|x86_64")
else
Expand Down Expand Up @@ -135,7 +135,7 @@ target("LeviLamina")
add_files("src/ll/core/**.rc")
end

if is_config("target-type", "server") then
if is_config("target_type", "server") then
add_headerfiles(
"src-server/(ll/api/**.h)"
-- ,"src-server/(mc/**.h)"
Expand Down

0 comments on commit b4b8fdf

Please sign in to comment.