Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix build #16

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Attempt to fix build #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fe01e9
Fix windows build
xmish Dec 17, 2023
f2c3fd1
Attempt to build with cmake
xmish Dec 17, 2023
82e0b5c
CMakeLists.txt
xmish Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ endif ()
find_package(Threads REQUIRED)
find_package(PugiXML CONFIG REQUIRED)
find_package(Lua54 REQUIRED)
find_package(Sol2 REQUIRED)

find_package(Boost 1.66.0 REQUIRED COMPONENTS system iostreams)

Expand Down
69 changes: 34 additions & 35 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_subdirectory(luamodules)

set(tfs_SRC
${CMAKE_CURRENT_LIST_DIR}/otpch.cpp
${CMAKE_CURRENT_LIST_DIR}/actions.cpp
Expand Down Expand Up @@ -33,40 +31,40 @@ set(tfs_SRC
${CMAKE_CURRENT_LIST_DIR}/iomapserialize.cpp
${CMAKE_CURRENT_LIST_DIR}/item.cpp
${CMAKE_CURRENT_LIST_DIR}/items.cpp
${CMAKE_CURRENT_LIST_DIR}/luaactions.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luacombat.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luacondition.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luacontainer.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luacreature.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luacreatureevent.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luagame.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaglobalevent.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luagroup.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaguild.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luahouse.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaitem.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaitemtype.cpp" />
${CMAKE_CURRENT_LIST_DIR}/lualoot.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luamonster.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luamonsterspell.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luamonstertype.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luamoveevent.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luanetworkmessage.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luanpc.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaoutfit.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaparty.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaplayer.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaposition.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaactions.cpp
${CMAKE_CURRENT_LIST_DIR}/luacombat.cpp
${CMAKE_CURRENT_LIST_DIR}/luacondition.cpp
${CMAKE_CURRENT_LIST_DIR}/luacontainer.cpp
${CMAKE_CURRENT_LIST_DIR}/luacreature.cpp
${CMAKE_CURRENT_LIST_DIR}/luacreatureevent.cpp
${CMAKE_CURRENT_LIST_DIR}/luagame.cpp
${CMAKE_CURRENT_LIST_DIR}/luaglobalevent.cpp
${CMAKE_CURRENT_LIST_DIR}/luagroup.cpp
${CMAKE_CURRENT_LIST_DIR}/luaguild.cpp
${CMAKE_CURRENT_LIST_DIR}/luahouse.cpp
${CMAKE_CURRENT_LIST_DIR}/luaitem.cpp
${CMAKE_CURRENT_LIST_DIR}/luaitemtype.cpp
${CMAKE_CURRENT_LIST_DIR}/lualoot.cpp
${CMAKE_CURRENT_LIST_DIR}/luamonster.cpp
${CMAKE_CURRENT_LIST_DIR}/luamonsterspell.cpp
${CMAKE_CURRENT_LIST_DIR}/luamonstertype.cpp
${CMAKE_CURRENT_LIST_DIR}/luamoveevent.cpp
${CMAKE_CURRENT_LIST_DIR}/luanetworkmessage.cpp
${CMAKE_CURRENT_LIST_DIR}/luanpc.cpp
${CMAKE_CURRENT_LIST_DIR}/luaoutfit.cpp
${CMAKE_CURRENT_LIST_DIR}/luaparty.cpp
${CMAKE_CURRENT_LIST_DIR}/luaplayer.cpp
${CMAKE_CURRENT_LIST_DIR}/luaposition.cpp
${CMAKE_CURRENT_LIST_DIR}/luascript.cpp
${CMAKE_CURRENT_LIST_DIR}/luaspells.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luatalkaction.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luateleport.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luatile.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luatown.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luavariant.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luavocation.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaweapons.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaxml.cpp" />
${CMAKE_CURRENT_LIST_DIR}/luaspells.cpp
${CMAKE_CURRENT_LIST_DIR}/luatalkaction.cpp
${CMAKE_CURRENT_LIST_DIR}/luateleport.cpp
${CMAKE_CURRENT_LIST_DIR}/luatile.cpp
${CMAKE_CURRENT_LIST_DIR}/luatown.cpp
${CMAKE_CURRENT_LIST_DIR}/luavariant.cpp
${CMAKE_CURRENT_LIST_DIR}/luavocation.cpp
${CMAKE_CURRENT_LIST_DIR}/luaweapons.cpp
${CMAKE_CURRENT_LIST_DIR}/luaxml.cpp
${CMAKE_CURRENT_LIST_DIR}/mailbox.cpp
${CMAKE_CURRENT_LIST_DIR}/map.cpp
${CMAKE_CURRENT_LIST_DIR}/matrixarea.cpp
Expand Down Expand Up @@ -202,6 +200,7 @@ target_link_libraries(tfslib PRIVATE
Boost::iostreams
Boost::system
fmt::fmt
sol2::sol2
pugixml::pugixml
${CMAKE_THREAD_LIBS_INIT}
${Crypto++_LIBRARIES}
Expand Down
12 changes: 8 additions & 4 deletions vc17/theforgottenserver.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@
<TargetName>$(ProjectName)-$(Platform)</TargetName>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>true</VcpkgEnableManifest>
<VcpkgEnabled>true</VcpkgEnabled>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;$(PREPROCESSOR_DEFS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -95,7 +99,7 @@
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>$(VcpkgRoot)include\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
Expand All @@ -110,7 +114,7 @@
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>$(VcpkgRoot)include\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -128,7 +132,7 @@
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>$(VcpkgRoot)include\luajit;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
Expand Down Expand Up @@ -362,4 +366,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions vc17/theforgottenserver.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<ClCompile Include="..\src\weapons.cpp" />
<ClCompile Include="..\src\wildcardtree.cpp" />
<ClCompile Include="..\src\xtea.cpp" />
<ClCompile Include="..\src\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\luaactions.cpp">
Expand Down Expand Up @@ -213,7 +214,6 @@
<ClInclude Include="..\src\itemloader.h" />
<ClInclude Include="..\src\items.h" />
<ClInclude Include="..\src\lockfree.h" />
<ClInclude Include="..\src\luaenv.h" />
<ClInclude Include="..\src\luascript.h" />
<ClInclude Include="..\src\mailbox.h" />
<ClInclude Include="..\src\map.h" />
Expand Down Expand Up @@ -267,4 +267,4 @@
<UniqueIdentifier>{9156d8f4-e8e6-4a03-bbf7-dcc7e7357a85}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
</Project>
3 changes: 2 additions & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"fmt",
"libmariadb",
"lua",
"pugixml"
"pugixml",
"sol2"
],
"features": {
"luajit": {
Expand Down
Loading