From 3c2e7f1aadf3f6e9be7b86d1753d0bf26fd76e8f Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 24 Nov 2013 17:30:42 +0000 Subject: Fixed Visual Studio Files --- VC2008/MCServer.vcproj | 932 ++++++++++++++++++++++++------------------------- 1 file changed, 466 insertions(+), 466 deletions(-) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 93a34d90a..1b710e1e4 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1,4 +1,4 @@ - + @@ -1204,75 +1204,75 @@ Name="Entities" > @@ -1280,23 +1280,23 @@ Name="UI" > @@ -1304,79 +1304,79 @@ Name="Simulator" > @@ -1384,107 +1384,107 @@ Name="OSSupport" > @@ -1848,7 +1848,7 @@ > @@ -1896,43 +1896,43 @@ Name="WorldStorage" > @@ -1940,123 +1940,123 @@ Name="Generating" > @@ -2064,283 +2064,283 @@ Name="Blocks" > @@ -2348,123 +2348,123 @@ Name="Items" > @@ -2472,71 +2472,71 @@ Name="Protocol" > @@ -2544,7 +2544,7 @@ Name="SQLite" > @@ -2628,7 +2628,7 @@ Name="LuaExpat" > @@ -2672,87 +2672,87 @@ Name="BlockEntities" > @@ -2760,59 +2760,59 @@ Name="HTTPServer" > -- cgit v1.2.3 From e3db69c4ae5d373ea1f1b31c0fc1889f328ea2ed Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 24 Nov 2013 18:44:22 +0000 Subject: Attempt to fix compilation --- VC2008/MCServer.vcproj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 1b710e1e4..524ffdfd4 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1685,7 +1685,7 @@ @@ -1696,7 +1696,7 @@ @@ -1707,7 +1707,7 @@ @@ -1718,7 +1718,7 @@ @@ -1848,7 +1848,7 @@ > @@ -2544,7 +2544,7 @@ Name="SQLite" > @@ -2628,7 +2628,7 @@ Name="LuaExpat" > -- cgit v1.2.3 From 1358a74412b45b1c214bfe58f4c5160ca75f4da7 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Mon, 25 Nov 2013 22:09:20 +0100 Subject: Added ExpOrb.cpp and ExpOrb.h to MCServer.vcproj. --- VC2008/MCServer.vcproj | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 93a34d90a..f9acdd852 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1267,6 +1267,14 @@ RelativePath="..\source\Entities\ProjectileEntity.h" > + + + + -- cgit v1.2.3 From 3466d2cad9a5723c327c3a64123b5321df968ba5 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 25 Nov 2013 21:32:09 +0000 Subject: Fixed all outstanding VS compilation issues Also updated VS2008 files. --- VC2008/MCServer.vcproj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 524ffdfd4..ff0e328e0 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";..;../expat" + AdditionalIncludeDirectories=""../lib/zlib";"../lib/jsoncpp/include";"../lib/lua/src";"../lib/tolua++/include";..;../lib/expat" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -121,7 +121,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" WholeProgramOptimization="true" - AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";..;../expat" + AdditionalIncludeDirectories=""../lib/zlib";"../lib/jsoncpp/include";"../lib/lua/src";"../lib/tolua++/include";..;../lib/expat" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC" RuntimeLibrary="0" UsePrecompiledHeader="2" @@ -200,7 +200,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" WholeProgramOptimization="true" - AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";..;../expat" + AdditionalIncludeDirectories=""../lib/zlib";"../lib/jsoncpp/include";"../lib/lua/src";"../lib/tolua++/include";..;../lib/expat" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC" RuntimeLibrary="0" UsePrecompiledHeader="2" @@ -277,7 +277,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";..;../expat" + AdditionalIncludeDirectories=""../lib/zlib";"../lib/jsoncpp/include";"../lib/lua/src";"../lib/tolua++/include";..;../lib/expat" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -1685,7 +1685,7 @@ @@ -1696,7 +1696,7 @@ @@ -1707,7 +1707,7 @@ @@ -1718,7 +1718,7 @@ @@ -1840,11 +1840,11 @@ Name="External" > Date: Wed, 27 Nov 2013 09:17:25 +0100 Subject: Fixed VC2008 compilation, normalized include paths. --- VC2008/MCServer.vcproj | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index f189da9d7..2a2ddb4ee 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1,4 +1,4 @@ - + + + + + @@ -1271,14 +1279,6 @@ RelativePath="..\src\Entities\TNTEntity.cpp" > - - - - -- cgit v1.2.3 From 97b03df3724c58acdbbbdd91d6867722c64ae5f9 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 27 Nov 2013 14:24:36 +0100 Subject: Fixed Win nightbuild scripts after folder moves. --- VC2008/MCServer.vcproj | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'VC2008/MCServer.vcproj') diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 2a2ddb4ee..e0c57d50d 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -924,6 +924,14 @@ RelativePath="..\src\Vector3i.h" > + + + + -- cgit v1.2.3