Skip to content

Issue 19 - Fix library dependencies for D2 client and server #28

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

Open
typedefn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue 19 - Fix library dependencies for D2 client and server #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ if(BUILD_D2CLIENT)
set_target_properties(D2Client PROPERTIES OUTPUT_NAME D2Client)
set_target_properties(D2Client PROPERTIES LINKER_LANGUAGE CXX)

target_link_libraries(D2Client D2Common)
target_link_libraries(D2Client ${STATIC_LIBRARIES})
target_compile_definitions(D2Client PUBLIC D2CLIENT)
endif()
Expand All @@ -127,6 +128,7 @@ if(BUILD_D2SERVER)
set_target_properties(D2Server PROPERTIES OUTPUT_NAME D2Server)
set_target_properties(D2Server PROPERTIES LINKER_LANGUAGE CXX)

target_link_libraries(D2Server D2Common)
target_link_libraries(D2Server ${STATIC_LIBRARIES})
target_compile_definitions(D2Server PUBLIC D2SERVER)
endif()
2 changes: 1 addition & 1 deletion Game/Platform_Linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ namespace Sys
}
else if (nModule == MODULE_SERVER)
{
bModuleFound = FS::Find("liD2Game.so", szModulePath, MAX_D2PATH_ABSOLUTE);
bModuleFound = FS::Find("libD2Server.so", szModulePath, MAX_D2PATH_ABSOLUTE);
}
Log_ErrorAssertReturn(bModuleFound, nullptr);

Expand Down