From 1022b15ea291760cc842f12c91ff9bdcc3232dac Mon Sep 17 00:00:00 2001 From: Pontus Fransson Date: Mon, 18 Nov 2013 16:47:57 +0100 Subject: [PATCH 1/2] Removed stuff from project files --- .../NetworkDependencies/NetworkDependencies.vcxproj | 8 ++++---- .../OysterNetworkClient/OysterNetworkClient.vcxproj | 8 ++++---- Code/Network/OysterNetworkClient/main.cpp | 7 ++++++- .../OysterNetworkServer/OysterNetworkServer.vcxproj | 8 ++++---- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj index 309f56cb..0860584c 100644 --- a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj +++ b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj @@ -90,7 +90,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -101,7 +101,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -114,7 +114,7 @@ true true true - ..\..\Misc;..\..\OysterMath;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ true true true - ..\..\Misc;..\..\OysterMath;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true diff --git a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj index ebd4c40d..5cf417da 100644 --- a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj +++ b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj @@ -90,7 +90,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -101,7 +101,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -114,7 +114,7 @@ true true true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ true true true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true diff --git a/Code/Network/OysterNetworkClient/main.cpp b/Code/Network/OysterNetworkClient/main.cpp index aa0cf6dc..79543689 100644 --- a/Code/Network/OysterNetworkClient/main.cpp +++ b/Code/Network/OysterNetworkClient/main.cpp @@ -1,5 +1,10 @@ +#include +using namespace std; + int main() { - + cout << "Asd" << endl; + + return 0; } \ No newline at end of file diff --git a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj index 2c829da2..7a31279b 100644 --- a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj +++ b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj @@ -90,7 +90,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -101,7 +101,7 @@ Level3 Disabled true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -114,7 +114,7 @@ true true true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true @@ -129,7 +129,7 @@ true true true - ..\..\Misc;..\..\OysterMath;..\NetworkDependencies;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true From c04593b575b89574c17ec2a6d7893a59a18f0540 Mon Sep 17 00:00:00 2001 From: Pontus Fransson Date: Tue, 19 Nov 2013 09:34:24 +0100 Subject: [PATCH 2/2] Changed name on main files on server and client --- .../OysterNetworkClient/{main.cpp => ClientMain.cpp} | 2 +- .../OysterNetworkClient/OysterNetworkClient.vcxproj | 2 +- .../OysterNetworkClient.vcxproj.filters | 2 +- .../OysterNetworkServer/OysterNetworkServer.vcxproj | 2 +- .../OysterNetworkServer.vcxproj.filters | 2 +- Code/Network/OysterNetworkServer/ServerMain.cpp | 10 ++++++++++ Code/Network/OysterNetworkServer/main.cpp | 5 ----- 7 files changed, 15 insertions(+), 10 deletions(-) rename Code/Network/OysterNetworkClient/{main.cpp => ClientMain.cpp} (70%) create mode 100644 Code/Network/OysterNetworkServer/ServerMain.cpp delete mode 100644 Code/Network/OysterNetworkServer/main.cpp diff --git a/Code/Network/OysterNetworkClient/main.cpp b/Code/Network/OysterNetworkClient/ClientMain.cpp similarity index 70% rename from Code/Network/OysterNetworkClient/main.cpp rename to Code/Network/OysterNetworkClient/ClientMain.cpp index 79543689..0e14df6f 100644 --- a/Code/Network/OysterNetworkClient/main.cpp +++ b/Code/Network/OysterNetworkClient/ClientMain.cpp @@ -3,7 +3,7 @@ using namespace std; int main() { - cout << "Asd" << endl; + cout << "Client" << endl; return 0; diff --git a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj index 5cf417da..6d9b69b4 100644 --- a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj +++ b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj @@ -149,7 +149,7 @@ - + diff --git a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj.filters b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj.filters index 8755a3a0..cd4a498b 100644 --- a/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj.filters +++ b/Code/Network/OysterNetworkClient/OysterNetworkClient.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files diff --git a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj index 7a31279b..6dba87c1 100644 --- a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj +++ b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj @@ -149,7 +149,7 @@ - + diff --git a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj.filters b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj.filters index 8755a3a0..f8025a15 100644 --- a/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj.filters +++ b/Code/Network/OysterNetworkServer/OysterNetworkServer.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files diff --git a/Code/Network/OysterNetworkServer/ServerMain.cpp b/Code/Network/OysterNetworkServer/ServerMain.cpp new file mode 100644 index 00000000..10903cda --- /dev/null +++ b/Code/Network/OysterNetworkServer/ServerMain.cpp @@ -0,0 +1,10 @@ +#include +using namespace std; + +int main() +{ + cout << "Server" << endl; + + + return 0; +} \ No newline at end of file diff --git a/Code/Network/OysterNetworkServer/main.cpp b/Code/Network/OysterNetworkServer/main.cpp deleted file mode 100644 index bd889a99..00000000 --- a/Code/Network/OysterNetworkServer/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -int main() -{ - - return 0; -} \ No newline at end of file