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

Fixing two project errors stoping correct compilation of the iOS project in XCode 7 - RakNet pull request #82 #34

Merged
merged 2 commits into from
Apr 2, 2018
Merged

Fixing two project errors stoping correct compilation of the iOS project in XCode 7 - RakNet pull request #82 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cffe3
Fixing compile error in XCode
aardvarkk Jan 12, 2016
b5d26d8
Fixing incorrect file reference
aardvarkk Jan 12, 2016
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
9 changes: 7 additions & 2 deletions RakNet_IOS_XCode/RakNetTest.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
1025320E16A6775E0000C5BD /* RPC4Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025317B16A6775E0000C5BD /* RPC4Plugin.cpp */; };
1025320F16A6775E0000C5BD /* SecureHandshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025317D16A6775E0000C5BD /* SecureHandshake.cpp */; };
1025321016A6775E0000C5BD /* SendToThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025317F16A6775E0000C5BD /* SendToThread.cpp */; };
1025321116A6775E0000C5BD /* SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025318116A6775E0000C5BD /* SHA1.cpp */; };
1025321216A6775E0000C5BD /* SignaledEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025318316A6775E0000C5BD /* SignaledEvent.cpp */; };
1025321316A6775E0000C5BD /* SimpleMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025318516A6775E0000C5BD /* SimpleMutex.cpp */; };
1025321416A6775E0000C5BD /* SocketLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1025318B16A6775E0000C5BD /* SocketLayer.cpp */; };
Expand All @@ -130,6 +129,7 @@
1025322616A6775E0000C5BD /* VariadicSQLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 102531B216A6775E0000C5BD /* VariadicSQLParser.cpp */; };
1025322716A6775E0000C5BD /* VitaIncludes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 102531B416A6775E0000C5BD /* VitaIncludes.cpp */; };
1025322816A6775E0000C5BD /* WSAStartupSingleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 102531B716A6775E0000C5BD /* WSAStartupSingleton.cpp */; };
8A40EF091C4572F6001864D2 /* DR_SHA1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A40EF071C4572F6001864D2 /* DR_SHA1.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -413,6 +413,8 @@
102531B716A6775E0000C5BD /* WSAStartupSingleton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WSAStartupSingleton.cpp; sourceTree = "<group>"; };
102531B816A6775E0000C5BD /* WSAStartupSingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WSAStartupSingleton.h; sourceTree = "<group>"; };
102531B916A6775E0000C5BD /* XBox360Includes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBox360Includes.h; sourceTree = "<group>"; };
8A40EF071C4572F6001864D2 /* DR_SHA1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DR_SHA1.cpp; sourceTree = "<group>"; };
8A40EF081C4572F6001864D2 /* DR_SHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DR_SHA1.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -488,6 +490,8 @@
102530B216A6775E0000C5BD /* Source */ = {
isa = PBXGroup;
children = (
8A40EF071C4572F6001864D2 /* DR_SHA1.cpp */,
8A40EF081C4572F6001864D2 /* DR_SHA1.h */,
102530B316A6775E0000C5BD /* _FindFirst.cpp */,
102530B416A6775E0000C5BD /* _FindFirst.h */,
102530B516A6775E0000C5BD /* AutopatcherPatchContext.h */,
Expand Down Expand Up @@ -864,6 +868,7 @@
102531D916A6775E0000C5BD /* GridSectorizer.cpp in Sources */,
102531DA16A6775E0000C5BD /* HTTPConnection.cpp in Sources */,
102531DB16A6775E0000C5BD /* HTTPConnection2.cpp in Sources */,
8A40EF091C4572F6001864D2 /* DR_SHA1.cpp in Sources */,
102531DC16A6775E0000C5BD /* IncrementalReadInterface.cpp in Sources */,
102531DD16A6775E0000C5BD /* Itoa.cpp in Sources */,
102531DE16A6775E0000C5BD /* LinuxStrings.cpp in Sources */,
Expand Down Expand Up @@ -914,7 +919,6 @@
1025320E16A6775E0000C5BD /* RPC4Plugin.cpp in Sources */,
1025320F16A6775E0000C5BD /* SecureHandshake.cpp in Sources */,
1025321016A6775E0000C5BD /* SendToThread.cpp in Sources */,
1025321116A6775E0000C5BD /* SHA1.cpp in Sources */,
1025321216A6775E0000C5BD /* SignaledEvent.cpp in Sources */,
1025321316A6775E0000C5BD /* SimpleMutex.cpp in Sources */,
1025321416A6775E0000C5BD /* SocketLayer.cpp in Sources */,
Expand Down Expand Up @@ -1062,6 +1066,7 @@
102530B116A675EE0000C5BD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
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)==nullptr)
{
Connection_RM3 *connection = AllocConnection(rakPeerInterface->GetSystemAddressFromGuid(participantListIn[index]), participantListIn[index]);
if (connection)
Expand Down