Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Proper Installation #29

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Proper Installation #29

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
3898a7d
Fixed proper installation destination
TheComet Sep 5, 2014
6215885
Fixed proper installation destination for static lib
TheComet Sep 5, 2014
71cadf6
Fixed an issue where a pointer was being compared to a bool
TheComet Sep 7, 2014
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
12 changes: 6 additions & 6 deletions Lib/DLL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ IF(WIN32 AND NOT UNIX)
SET( CMAKE_CXX_FLAGS "/D WIN32 /D _RAKNET_DLL /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_DEPRECATE /GS- /GR- ")
ENDIF(WIN32 AND NOT UNIX)

IF(WIN32 AND NOT UNIX)
target_link_libraries (RakNetDLL ${RAKNET_LIBRARY_LIBS})
ELSE(WIN32 AND NOT UNIX)
target_link_libraries (RakNetDLL ${RAKNET_LIBRARY_LIBS})
INSTALL(TARGETS RakNetDLL DESTINATION ${RakNet_SOURCE_DIR}/Lib/DLL)
ENDIF(WIN32 AND NOT UNIX)
target_link_libraries (RakNetDLL ${RAKNET_LIBRARY_LIBS})

# install lib and header files to CMAKE_INSTALL_PREFIX
install(TARGETS RakNetDLL DESTINATION "lib")
install(FILES ${ALL_HEADER_SRCS} DESTINATION "include/RakNet")

6 changes: 4 additions & 2 deletions Lib/LibStatic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ IF(WIN32 AND NOT UNIX)

ELSE(WIN32 AND NOT UNIX)
target_link_libraries (RakNetLibStatic ${RAKNET_LIBRARY_LIBS})
INSTALL(TARGETS RakNetLibStatic DESTINATION ${RakNet_SOURCE_DIR}/Lib/RakNetLibStatic)
INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION ${RakNet_SOURCE_DIR}/include/raknet)
ENDIF(WIN32 AND NOT UNIX)

INSTALL(TARGETS RakNetLibStatic DESTINATION "lib")
INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION "include/RakNet")



2 changes: 1 addition & 1 deletion Source/ReplicaManager3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void ReplicaManager3::AutoCreateConnectionList(
{
for (unsigned int index=0; index < participantListIn.Size(); index++)
{
if (GetConnectionByGUID(participantListIn[index], worldId)==false)
if (GetConnectionByGUID(participantListIn[index], worldId)==NULL)
{
Connection_RM3 *connection = AllocConnection(rakPeerInterface->GetSystemAddressFromGuid(participantListIn[index]), participantListIn[index]);
if (connection)
Expand Down