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/CryptoPP.vcxproj | 130 ++++++++++++++++++++++++++++++++++++++++ VC2013/CryptoPP.vcxproj.filters | 6 +- VC2013/JsonCpp.vcxproj | 29 +++++++++ VC2013/Lua.vcxproj | 56 ++++++++++++++--- VC2013/Lua.vcxproj.filters | 3 - VC2013/MCServer.sln | 15 +++++ VC2013/MCServer.vcxproj | 78 +++++++++++++++++++++++- VC2013/MCServer.vcxproj.filters | 52 ++++++++-------- VC2013/ToLua.vcxproj | 29 +++++++++ VC2013/expat.vcxproj | 28 +++++++++ VC2013/zlib.vcxproj | 29 +++++++++ 11 files changed, 413 insertions(+), 42 deletions(-) (limited to 'VC2013') diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj index 7355ab64b..7ad8edaf6 100644 --- a/VC2013/CryptoPP.vcxproj +++ b/VC2013/CryptoPP.vcxproj @@ -1,6 +1,14 @@  + + Debug_LuaStatic + Win32 + + + Debug_LuaStatic + x64 + Debug Win32 @@ -48,6 +56,11 @@ Application v120 + + StaticLibrary + v120 + false + StaticLibrary v120 @@ -70,6 +83,10 @@ false true + + Application + v120 + StaticLibrary v120 @@ -90,6 +107,10 @@ + + + + @@ -106,6 +127,9 @@ + + + @@ -126,6 +150,10 @@ $(SolutionDir)$(Configuration)\CryptoPP\ $(Configuration)\CryptoPP\ + + $(SolutionDir)$(Configuration)\CryptoPP\ + $(Configuration)\CryptoPP\ + $(Platform)\Output\$(Configuration)\ $(Platform)\$(ProjectName)\$(Configuration)\ @@ -187,6 +215,27 @@ true + + + Disabled + true + _DEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32;%(PreprocessorDefinitions) + MultiThreadedDebug + StreamingSIMDExtensions + Use + pch.h + $(OutDir)vc80.pdb + Level3 + true + EditAndContinue + + + 0x0409 + + + true + + X64 @@ -292,24 +341,28 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -317,24 +370,28 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -342,6 +399,7 @@ Disabled MaxSpeed + Disabled Disabled Disabled @@ -350,18 +408,21 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -370,12 +431,14 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -386,6 +449,9 @@ MaxSpeed + Disabled + + Disabled @@ -400,6 +466,7 @@ Disabled MaxSpeed + Disabled Disabled Disabled @@ -407,6 +474,7 @@ Disabled MaxSpeed + Disabled Disabled Disabled @@ -415,6 +483,8 @@ Disabled true MaxSpeed + true + Disabled true Disabled true @@ -425,12 +495,14 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -440,6 +512,8 @@ Disabled true MaxSpeed + true + Disabled true Disabled true @@ -450,24 +524,28 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -475,48 +553,56 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -529,6 +615,9 @@ MaxSpeed + Disabled + + Disabled @@ -543,72 +632,84 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -617,6 +718,8 @@ Create MaxSpeed Create + Disabled + Create Disabled Create Disabled @@ -627,12 +730,14 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -640,66 +745,77 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -707,72 +823,84 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled @@ -780,12 +908,14 @@ Disabled MaxSpeed + Disabled Disabled Disabled Disabled MaxSpeed + Disabled Disabled Disabled diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index ba7db9584..bc8e51b81 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,15 +2,15 @@ - {a4186d1f-f2a9-4b49-b13b-a710ef40a767} + {9cc4f7b9-4c1a-4f43-ba70-d1780e59b9af} .cpp - {56d100a3-fe61-4f9d-b7c1-b750a9faf1b1} + {4570686f-18a1-4d38-a53b-062a4c223d4d} .;.h - {fd15b788-329a-459d-b675-9af86fbaa35a} + {6c599481-412e-461e-b3b3-949c4f43474a} diff --git a/VC2013/JsonCpp.vcxproj b/VC2013/JsonCpp.vcxproj index f1dd1c7b5..c609a3450 100644 --- a/VC2013/JsonCpp.vcxproj +++ b/VC2013/JsonCpp.vcxproj @@ -5,6 +5,10 @@ Debug profiled Win32 + + Debug_LuaStatic + Win32 + Debug Win32 @@ -24,6 +28,11 @@ Win32Proj + + StaticLibrary + v120 + Unicode + StaticLibrary v120 @@ -49,6 +58,9 @@ + + + @@ -81,6 +93,10 @@ $(SolutionDir)$(Configuration)\JsonCpp\ $(Configuration)\JsonCpp\ + + $(SolutionDir)$(Configuration)\JsonCpp\ + $(Configuration)\JsonCpp\ + Disabled @@ -133,6 +149,19 @@ EditAndContinue + + + Disabled + ../jsoncpp-src-0.5.0/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj index 2488aa6aa..8b330a666 100644 --- a/VC2013/Lua.vcxproj +++ b/VC2013/Lua.vcxproj @@ -5,6 +5,10 @@ Debug profiled Win32 + + Debug_LuaStatic + Win32 + Debug Win32 @@ -24,31 +28,39 @@ Win32Proj - + StaticLibrary v120 Unicode + + DynamicLibrary + v120 + Unicode + - StaticLibrary + DynamicLibrary v120 Unicode true - StaticLibrary + DynamicLibrary v120 Unicode true - StaticLibrary + DynamicLibrary v120 Unicode + + + @@ -81,10 +93,14 @@ $(SolutionDir)$(Configuration)\Lua\ $(Configuration)\Lua\ + + $(SolutionDir)$(Configuration)\Lua\ + $(Configuration)\Lua\ + Disabled - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -92,32 +108,57 @@ Level3 EditAndContinue + + $(ProjectDir)\..\MCServer\lua5.1.dll + true + MaxSpeed true - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreaded true Level3 ProgramDatabase + + $(ProjectDir)\..\MCServer\lua5.1.dll + MaxSpeed true - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) MultiThreaded true Level3 ProgramDatabase + + $(ProjectDir)\..\MCServer\lua5.1.dll + + + Disabled + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + $(ProjectDir)\..\MCServer\lua5.1.dll + + + Disabled WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -156,7 +197,6 @@ - diff --git a/VC2013/Lua.vcxproj.filters b/VC2013/Lua.vcxproj.filters index 21cc86850..6d96411ec 100644 --- a/VC2013/Lua.vcxproj.filters +++ b/VC2013/Lua.vcxproj.filters @@ -85,9 +85,6 @@ Source Files - - Source Files - Source Files diff --git a/VC2013/MCServer.sln b/VC2013/MCServer.sln index 9dcfc802e..02eef049b 100644 --- a/VC2013/MCServer.sln +++ b/VC2013/MCServer.sln @@ -19,6 +19,7 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug profiled|Win32 = Debug profiled|Win32 + Debug_LuaStatic|Win32 = Debug_LuaStatic|Win32 Debug|Win32 = Debug|Win32 Release profiled|Win32 = Release profiled|Win32 Release|Win32 = Release|Win32 @@ -26,6 +27,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug|Win32.ActiveCfg = Debug|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug|Win32.Build.0 = Debug|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -34,6 +37,8 @@ Global {32012054-0C96-4C43-AB27-174FF8E72D66}.Release|Win32.Build.0 = Release|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug|Win32.ActiveCfg = Debug|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug|Win32.Build.0 = Debug|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -42,6 +47,8 @@ Global {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Release|Win32.Build.0 = Release|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug|Win32.ActiveCfg = Debug|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug|Win32.Build.0 = Debug|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -50,6 +57,8 @@ Global {5AAA90B9-946D-4034-83F3-676B06A6E326}.Release|Win32.Build.0 = Release|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {082E8185-7B3A-4945-8C82-9132341A329D}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {082E8185-7B3A-4945-8C82-9132341A329D}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug|Win32.ActiveCfg = Debug|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug|Win32.Build.0 = Debug|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -58,6 +67,8 @@ Global {082E8185-7B3A-4945-8C82-9132341A329D}.Release|Win32.Build.0 = Release|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug|Win32.ActiveCfg = Debug|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug|Win32.Build.0 = Debug|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -66,6 +77,8 @@ Global {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Release|Win32.Build.0 = Release|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug profiled|Win32.ActiveCfg = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug profiled|Win32.Build.0 = Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release profiled|Win32.ActiveCfg = Release|Win32 @@ -74,6 +87,8 @@ Global {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug profiled|Win32.ActiveCfg = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug profiled|Win32.Build.0 = Debug|Win32 + {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug|Win32.ActiveCfg = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug|Win32.Build.0 = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Release profiled|Win32.ActiveCfg = Release|Win32 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 @@ + + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index f84fdf1a5..be0a37dc1 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -10,73 +10,73 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - {d3e4f61e-bc56-4454-8036-8a546cf8fb0b} + {52f3d533-108a-4cd8-8be2-19c799667e26} - {520ca259-2c9e-482f-9690-1768c4d29939} + {727392f6-6dc8-4c0f-8380-2affc45d20d4} - {21ab8bcf-53a0-4eec-b597-db45d6cd8635} + {169eedf6-1244-49d1-9a74-79002dee80a7} - {73debd14-b218-4313-9389-1a0e62dae8b7} + {78798af4-7e8b-4f86-8175-c34995b71a7f} - {2cbd2a0f-6204-4ed6-a825-f9e81fe86d98} + {a9d6163b-75c5-47ef-8ebd-192c0053d987} - {b80f90c1-713e-4c86-ab50-78d7f5aa6c82} + {4e664e9b-8741-4701-9f32-60dcc29f6463} - {d29f7a59-d5d7-4b06-bd73-563007f3a15a} + {5496fc08-0db0-4de0-adff-760fa67a8a78} - {c8e6ce30-56d9-42b7-8a5d-0af0f1b8c5c6} + {0162bb1a-bed1-4e87-9ab7-c3da55911060} - {0aff46f9-2a5c-4e23-8227-6c7a318efd98} + {82c6a5ba-3211-4c01-a643-9cdf2983630f} - {86cc1a62-5a4a-4b55-9919-c1944a2f17bc} + {fc99053a-c609-4646-ad85-9cbaccbcf1c5} - {6ae1cee3-6e6a-464e-806c-5dd353137bdd} + {83b41e57-43fe-4bfc-8ca5-d0d460834d59} - {2e9149ad-0762-42b6-9041-e23f83934380} + {d53d761d-7d28-41dd-9623-6b489fbba65a} - {43922b25-52e6-41e0-a534-0220c585fb64} + {d3534b5b-4684-4857-befa-b78b9198eed8} - {28ba3c86-6782-4b9c-8ad1-4815a9990f56} + {96831397-1e56-4d07-9a3f-d97b9caa3f64} - {17718a17-83c9-4e37-9be9-a7974fae412c} + {6c6cceb3-545c-4698-a5c9-c01497e80022} - {5f9cb95f-1a51-4962-ad30-09c5e43dd9ae} + {7491cc4f-d735-4546-8aad-24d11a7396b0} - {ee51cab4-2a1d-4fb2-9f33-ff5f42ee5c2c} + {201c626a-b869-407a-9c2a-e06cf8c8e127} - {a4c0514f-61e0-4a3e-90af-aa92850a6cad} + {cd93064b-e465-4562-a09b-de2363d0fab4} - {cdc2d187-0019-4de2-8f76-d224bbda63ee} + {8947d9a2-b1dc-4c3e-8c27-05ca5260843d} - {9960d29d-8cdd-48a7-8f72-6abb7882e0f8} + {26e14e8c-ffde-4f83-b3a0-e0001d590e7a} - {39ac0d09-047a-43f4-8472-d99ba62834e5} + {44ae2ab1-5552-4e84-b8b5-f28a59af0c4f} - {7b6aed62-c48a-4c44-83ca-e459a16a6232} + {ac8a4c54-36f2-4505-a0dc-66f2817ccfa7} - {4feccf69-36aa-4881-a844-7a6f8a9e8291} + {3e58b3c7-097f-4688-a619-2771353180fe} @@ -759,6 +759,9 @@ Source Files\Blocks + + Source Files\Blocks + Source Files\Blocks @@ -942,9 +945,6 @@ Source Files\HTTPServer - - Source Files\Blocks - diff --git a/VC2013/ToLua.vcxproj b/VC2013/ToLua.vcxproj index c798af657..4895f0a61 100644 --- a/VC2013/ToLua.vcxproj +++ b/VC2013/ToLua.vcxproj @@ -5,6 +5,10 @@ Debug profiled Win32 + + Debug_LuaStatic + Win32 + Debug Win32 @@ -24,6 +28,11 @@ Win32Proj + + StaticLibrary + v120 + Unicode + StaticLibrary v120 @@ -49,6 +58,9 @@ + + + @@ -81,6 +93,10 @@ $(SolutionDir)$(Configuration)\ToLua\ $(Configuration)\ToLua\ + + $(SolutionDir)$(Configuration)\ToLua\ + $(Configuration)\ToLua\ + Disabled @@ -133,6 +149,19 @@ EditAndContinue + + + Disabled + ../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + diff --git a/VC2013/expat.vcxproj b/VC2013/expat.vcxproj index 388bf6158..00f9ea3d2 100644 --- a/VC2013/expat.vcxproj +++ b/VC2013/expat.vcxproj @@ -1,6 +1,10 @@  + + Debug_LuaStatic + Win32 + Debug Win32 @@ -16,6 +20,11 @@ Win32Proj + + StaticLibrary + v120 + MultiByte + StaticLibrary v120 @@ -30,6 +39,9 @@ + + + @@ -48,6 +60,10 @@ $(SolutionDir)$(Configuration)\ $(Configuration)/expat\ + + $(SolutionDir)$(Configuration)\expat\ + $(Configuration)\expat\ + Disabled @@ -72,6 +88,18 @@ ProgramDatabase + + + Disabled + WIN32;_DEBUG;_LIB;COMPILED_FROM_DSP;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + diff --git a/VC2013/zlib.vcxproj b/VC2013/zlib.vcxproj index 3aeacf329..7bb2b743b 100644 --- a/VC2013/zlib.vcxproj +++ b/VC2013/zlib.vcxproj @@ -5,6 +5,10 @@ Debug profiled Win32 + + Debug_LuaStatic + Win32 + Debug Win32 @@ -24,6 +28,11 @@ Win32Proj + + StaticLibrary + v120 + Unicode + StaticLibrary v120 @@ -49,6 +58,9 @@ + + + @@ -81,6 +93,10 @@ $(SolutionDir)$(Configuration)\zlib\ $(Configuration)\zlib\ + + $(SolutionDir)$(Configuration)\zlib\ + $(Configuration)\zlib\ + Disabled @@ -133,6 +149,19 @@ 4996;%(DisableSpecificWarnings) + + + Disabled + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + 4996;%(DisableSpecificWarnings) + + -- 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 ++ VC2013/MCServer.vcxproj.filters | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'VC2013') 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 @@ + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index be0a37dc1..4e22f5517 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -945,6 +945,9 @@ Source Files\HTTPServer + + Source Files\BlockEntities + @@ -1654,6 +1657,9 @@ Source Files\HTTPServer + + Source Files\BlockEntities + -- 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 + VC2013/MCServer.vcxproj.filters | 3 +++ 2 files changed, 4 insertions(+) (limited to 'VC2013') 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 @@ + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index 4e22f5517..2f0794e85 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -948,6 +948,9 @@ Source Files\BlockEntities + + Source Files\Blocks + -- 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/GenerateBindings.cmd | 2 +- VC2013/MCServer.vcxproj | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'VC2013') diff --git a/VC2013/GenerateBindings.cmd b/VC2013/GenerateBindings.cmd index 1ee0f3bf0..e247d7f4f 100644 --- a/VC2013/GenerateBindings.cmd +++ b/VC2013/GenerateBindings.cmd @@ -1,3 +1,3 @@ set ALLTOLUA_WAIT=N -cd ..\src +cd ..\src\Bindings AllToLua.bat \ No newline at end of file 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