From 5dfce5568e0b14c1a39f26b7fb22978aa9500711 Mon Sep 17 00:00:00 2001 From: mborland Date: Sun, 10 Nov 2013 02:33:34 -0500 Subject: VC2013 3rd times a charm? --- VC2013/MCServer.vcxproj | 895 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 895 insertions(+) create mode 100644 VC2013/MCServer.vcxproj (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj new file mode 100644 index 000000000..cd9f6eb4f --- /dev/null +++ b/VC2013/MCServer.vcxproj @@ -0,0 +1,895 @@ + + + + + Debug profiled + Win32 + + + Debug + Win32 + + + Release profiled + Win32 + + + Release + Win32 + + + + {32012054-0C96-4C43-AB27-174FF8E72D66} + MCServer + Win32Proj + + + + Application + v120 + MultiByte + + + Application + v120 + true + + + Application + v120 + true + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.21005.1 + + + ..\MCServer\ + Debug\ + true + + + Release\ + Release\ + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)\ + $(Configuration)\ + true + + + + /MP /FS %(AdditionalOptions) + Disabled + ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Globals.h + Level3 + ProgramDatabase + false + Speed + false + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + $(ProjectDir)\..\MCServer\$(ProjectName).exe + true + Console + MachineX86 + + + + + /MP %(AdditionalOptions) + Full + true + Speed + true + ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) + MultiThreaded + Use + Globals.h + Level3 + ProgramDatabase + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + $(ProjectDir)\..\MCServer\$(ProjectName).exe + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + /MP %(AdditionalOptions) + Full + true + Speed + true + ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) + MultiThreaded + Use + Globals.h + Level3 + ProgramDatabase + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + $(ProjectDir)\..\MCServer\$(ProjectName)_profiled.exe + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + true + + + + + /MP %(AdditionalOptions) + Disabled + ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Globals.h + Level3 + ProgramDatabase + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + $(ProjectDir)\..\MCServer\$(ProjectName)_dbgprof.exe + true + Console + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + GenerateBindings.cmd + + cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + Bindings.cpp;%(Outputs) + true + GenerateBindings.cmd + + cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + Bindings.cpp;%(Outputs) + true + GenerateBindings.cmd + + cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + Bindings.cpp;%(Outputs) + true + GenerateBindings.cmd + + cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + Bindings.cpp;%(Outputs) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + Level3 + + + Level3 + true + + + true + + + + + + + + + + + + + + + + + MaxSpeed + true + Speed + true + Default + + + MaxSpeed + true + Speed + true + Default + + + + + + + + + + + + + Level3 + + + Level3 + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {3423ec9a-52e4-4a4d-9753-edebc38785ef} + false + + + {5fcfaf8d-ff2c-456d-a72c-1d76f913ad96} + false + + + {5aaa90b9-946d-4034-83f3-676b06a6e326} + false + + + {082e8185-7b3a-4945-8c82-9132341a329d} + false + + + {eeab54ad-114c-4ab8-8482-0a52d502bd35} + false + + + {ea9d50fd-937a-4ef5-8c37-5f4175af4fea} + false + + + + + + \ No newline at end of file -- cgit v1.2.3 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 --- VC2013/MCServer.vcxproj | 964 +++++++++++++++++++++++------------------------- 1 file changed, 468 insertions(+), 496 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index cd9f6eb4f..ad0a0c49a 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -64,7 +64,7 @@ <_ProjectFileVersion>12.0.21005.1 - ..\MCServer\ + Debug\ Debug\ true @@ -83,7 +83,7 @@ - /MP /FS %(AdditionalOptions) + /MP %(AdditionalOptions) Disabled ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) @@ -94,13 +94,10 @@ Globals.h Level3 ProgramDatabase - false - Speed - false ws2_32.lib;Psapi.lib;%(AdditionalDependencies) - $(ProjectDir)\..\MCServer\$(ProjectName).exe + $(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe true Console MachineX86 @@ -189,293 +186,293 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true true true - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -491,7 +488,7 @@ true true - + true GenerateBindings.cmd @@ -566,35 +563,35 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Create Create Create Create - - - - - - + + + + + + Level3 @@ -608,19 +605,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + MaxSpeed true Speed @@ -636,13 +633,13 @@ - - - - - - - + + + + + + + Level3 @@ -656,78 +653,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true @@ -740,7 +737,7 @@ true true - + @@ -750,15 +747,15 @@ - - - - - - - + + + + + + + - + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -772,45 +769,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -820,7 +817,7 @@ - + @@ -830,7 +827,7 @@ - + @@ -840,55 +837,30 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - {3423ec9a-52e4-4a4d-9753-edebc38785ef} - false - - - {5fcfaf8d-ff2c-456d-a72c-1d76f913ad96} - false - - - {5aaa90b9-946d-4034-83f3-676b06a6e326} - false - - - {082e8185-7b3a-4945-8c82-9132341a329d} - false - - - {eeab54ad-114c-4ab8-8482-0a52d502bd35} - false - - - {ea9d50fd-937a-4ef5-8c37-5f4175af4fea} - false - - -- 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 --- VC2013/MCServer.vcxproj | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ad0a0c49a..ba2ca72d7 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,4 +1,4 @@ - + @@ -332,8 +332,8 @@ - - + + @@ -453,8 +453,8 @@ - - + + @@ -754,8 +754,8 @@ - - + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -807,7 +807,7 @@ - + @@ -817,7 +817,7 @@ - + @@ -827,7 +827,7 @@ - + @@ -857,7 +857,7 @@ - + -- cgit v1.2.3 From 32449f1fca8379d0c7f38e95834b2a01e62de06c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 25 Nov 2013 18:29:36 +0000 Subject: Further attempts to fix compile --- VC2013/MCServer.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ba2ca72d7..c9fe5c67c 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,4 +1,4 @@ - + @@ -85,7 +85,7 @@ /MP %(AdditionalOptions) Disabled - ../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;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks -- cgit v1.2.3 From 28b09377f351312887d04a53c5c50693a75d7c9d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 25 Nov 2013 18:43:46 +0000 Subject: Updated VS includes --- VC2013/MCServer.vcxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index c9fe5c67c..ff3abd68f 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -110,7 +110,7 @@ true Speed true - ../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;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) MultiThreaded Use @@ -136,7 +136,7 @@ true Speed true - ../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;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) MultiThreaded Use @@ -160,7 +160,7 @@ /MP %(AdditionalOptions) Disabled - ../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;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks -- 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. --- VC2013/MCServer.vcxproj | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ff3abd68f..ecb568e9a 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -332,7 +332,7 @@ - + @@ -492,22 +492,22 @@ true GenerateBindings.cmd - cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) Bindings.cpp;%(Outputs) true GenerateBindings.cmd - cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) Bindings.cpp;%(Outputs) true GenerateBindings.cmd - cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) Bindings.cpp;%(Outputs) true GenerateBindings.cmd - cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) Bindings.cpp;%(Outputs) @@ -754,7 +754,7 @@ - + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -861,6 +861,32 @@ + + + {3423ec9a-52e4-4a4d-9753-edebc38785ef} + false + + + {5fcfaf8d-ff2c-456d-a72c-1d76f913ad96} + false + + + {5aaa90b9-946d-4034-83f3-676b06a6e326} + false + + + {082e8185-7b3a-4945-8c82-9132341a329d} + false + + + {eeab54ad-114c-4ab8-8482-0a52d502bd35} + false + + + {ea9d50fd-937a-4ef5-8c37-5f4175af4fea} + false + + -- cgit v1.2.3 From 2ba4625835cb0f0dad3ffffbf2504f84f1535ef5 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 27 Nov 2013 21:10:01 +0000 Subject: Fixed VS2013 compiling --- VC2013/MCServer.vcxproj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ecb568e9a..251d401c9 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -85,7 +85,7 @@ /MP %(AdditionalOptions) Disabled - ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories) + ../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -110,7 +110,7 @@ true Speed true - ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories) + ../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) MultiThreaded Use @@ -136,7 +136,7 @@ true Speed true - ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories) + ../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) MultiThreaded Use @@ -160,7 +160,7 @@ /MP %(AdditionalOptions) Disabled - ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories) + ../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -245,6 +245,7 @@ + @@ -282,6 +283,7 @@ + @@ -659,6 +661,7 @@ + @@ -694,6 +697,7 @@ + -- cgit v1.2.3 From cee5160be879434fd59567c5b2d80af10c163276 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 29 Nov 2013 22:25:07 +0000 Subject: Removed unneeded CPP files Also removed unneeded #include in BlockStems --- VC2013/MCServer.vcxproj | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index 251d401c9..0b0c13d81 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,4 +1,4 @@ - + @@ -185,6 +185,7 @@ + @@ -794,14 +795,9 @@ - - - - - -- cgit v1.2.3 From 127d021cdef15219bd1fc96efadc778062fe9099 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 6 Dec 2013 19:15:53 +0000 Subject: Regenerated VS2013 files --- VC2013/MCServer.vcxproj | 78 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index 0b0c13d81..9c640f6dd 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,10 +1,14 @@ - + Debug profiled Win32 + + Debug_LuaStatic + Win32 + Debug Win32 @@ -24,6 +28,11 @@ Win32Proj + + Application + v120 + MultiByte + Application v120 @@ -47,6 +56,9 @@ + + + @@ -81,6 +93,11 @@ $(Configuration)\ true + + $(Configuration)\ + $(Configuration)\ + true + /MP %(AdditionalOptions) @@ -178,6 +195,28 @@ MachineX86 + + + /MP %(AdditionalOptions) + Disabled + ../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Use + Globals.h + Level3 + ProgramDatabase + + + ws2_32.lib;Psapi.lib;%(AdditionalDependencies) + $(ProjectDir)\..\MCServer\$(ProjectName)_debug_luastatic.exe + true + Console + MachineX86 + + @@ -185,7 +224,6 @@ - @@ -320,6 +358,7 @@ true + true true true true @@ -415,6 +454,7 @@ + @@ -481,12 +521,14 @@ true + true true true true true + true true true true @@ -497,6 +539,11 @@ cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) Bindings.cpp;%(Outputs) + true + GenerateBindings.cmd + + cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs) + Bindings.cpp;%(Outputs) true GenerateBindings.cmd @@ -585,6 +632,7 @@ Create + Create Create Create Create @@ -598,6 +646,9 @@ Level3 + + + Level3 Level3 @@ -628,6 +679,13 @@ Default + MaxSpeed + true + Speed + true + Default + + MaxSpeed true Speed @@ -646,6 +704,9 @@ Level3 + + + Level3 Level3 @@ -732,12 +793,14 @@ true + true true true true true + true true true true @@ -745,6 +808,8 @@ + + @@ -764,6 +829,9 @@ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -810,6 +878,8 @@ + + @@ -820,6 +890,8 @@ + + @@ -830,6 +902,8 @@ + + -- cgit v1.2.3 From 347e80bdd88f894394373745859f405dc82c1819 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 7 Dec 2013 00:18:58 +0000 Subject: Added basic ender chests Note that they just mirror chests now, so no per player inventory. --- VC2013/MCServer.vcxproj | 2 ++ 1 file changed, 2 insertions(+) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index 9c640f6dd..098253ac3 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -224,6 +224,7 @@ + @@ -615,6 +616,7 @@ + -- cgit v1.2.3 From 5bed85aba0720dc22db56dcaec28675c189491c4 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 7 Dec 2013 18:03:56 +0000 Subject: Fixed some new 1.7 client crash bugs Some technical blocks were removed; trying to render them as items caused a crash. --- VC2013/MCServer.vcxproj | 1 + 1 file changed, 1 insertion(+) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index 098253ac3..07e1ffb4a 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -225,6 +225,7 @@ + -- cgit v1.2.3 From 166f07029da91c27c2fc1e3f7f201105c6efa062 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 8 Dec 2013 14:45:24 +0000 Subject: Fixed binding generation and VS2013 compile --- VC2013/MCServer.vcxproj | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'VC2013/MCServer.vcxproj') diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index 07e1ffb4a..56fbdc165 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -1,4 +1,4 @@ - + @@ -367,15 +367,15 @@ - - - - - - + + + + + + - + @@ -808,7 +808,7 @@ true true - + @@ -820,13 +820,13 @@ - - - - - - - + + + + + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) -- cgit v1.2.3