Skip to content

Commit

Permalink
Merge branch 'xml' of https://gitee.com/xiyoo0812/quanta into xml
Browse files Browse the repository at this point in the history
  • Loading branch information
xiyoo0812 committed May 7, 2024
2 parents 917b88e + 0d162f8 commit faf33a2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion core/quanta/quanta.lmak
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ INCLUDES = {
--需要连接的库文件
LIBS = {
"lua",
"miniz",
"lualog"
}

Expand Down
1 change: 0 additions & 1 deletion core/quanta/quanta.mak
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ MYCFLAGS += -I$(SOLUTION_DIR)extend/mimalloc/mimalloc/include -include ../../mim
endif
#自定义库
LIBS += -llua
LIBS += -lminiz
LIBS += -llualog
ifeq ($(UNAME_S), Linux)
LIBS += -lstdc++fs
Expand Down
2 changes: 1 addition & 1 deletion core/quanta/quanta.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<SubSystem>Console</SubSystem>
<ImportLibrary>$(SolutionDir)library\$(Platform)\$(TargetName).lib</ImportLibrary>
<ProgramDatabaseFile>$(SolutionDir)temp\$(ProjectName)\$(Platform)\$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalDependencies>lua.lib;miniz.lib;lualog.lib;mimalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>lua.lib;lualog.lib;mimalloc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ForceFileOutput>
</ForceFileOutput>
</Link>
Expand Down

0 comments on commit faf33a2

Please sign in to comment.