From 3466d2cad9a5723c327c3a64123b5321df968ba5 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 25 Nov 2013 21:32:09 +0000 Subject: [PATCH] Fixed all outstanding VS compilation issues Also updated VS2008 files. --- VC2008/CryptoPP.vcproj | 30 +++++++++---------- VC2008/JsonCpp.vcproj | 12 ++++---- VC2008/Lua.vcproj | 2 +- VC2008/MCServer.vcproj | 20 ++++++------- VC2008/ToLua.cbp | 12 ++++---- VC2008/ToLua.vcproj | 8 ++--- VC2013/CryptoPP.vcxproj | 4 --- VC2013/CryptoPP.vcxproj.filters | 18 ++---------- VC2013/Lua.vcxproj | 2 +- VC2013/Lua.vcxproj.filters | 2 +- VC2013/MCServer.vcxproj | 38 ++++++++++++++++++++---- VC2013/MCServer.vcxproj.filters | 52 ++++++++++++++++----------------- VC2013/ToLua.vcxproj | 8 ++--- lib/tolua++/include/tolua++.h | 2 +- 14 files changed, 110 insertions(+), 100 deletions(-) diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj index 44f5f226c..530467eeb 100644 --- a/VC2008/CryptoPP.vcproj +++ b/VC2008/CryptoPP.vcproj @@ -663,7 +663,7 @@ diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj index 577507d50..8b35f170b 100644 --- a/VC2008/JsonCpp.vcproj +++ b/VC2008/JsonCpp.vcproj @@ -276,15 +276,15 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj index a21dadc66..326ba6411 100644 --- a/VC2008/Lua.vcproj +++ b/VC2008/Lua.vcproj @@ -304,7 +304,7 @@ > @@ -1696,7 +1696,7 @@ @@ -1707,7 +1707,7 @@ @@ -1718,7 +1718,7 @@ @@ -1840,11 +1840,11 @@ Name="External" > - + - + @@ -44,11 +44,11 @@ - + - + @@ -66,11 +66,11 @@ - + - + diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj index f174ba528..24a5d8b4f 100644 --- a/VC2008/ToLua.vcproj +++ b/VC2008/ToLua.vcproj @@ -41,7 +41,7 @@ - @@ -825,7 +824,6 @@ - @@ -868,7 +866,6 @@ - @@ -891,7 +888,6 @@ - diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index e8bea416f..793db552c 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,15 +2,15 @@ - {a8e36eec-ccdc-4b5d-acfa-59253ad7d84d} + {21031ece-70f0-4aa6-9069-6947175663ea} .cpp - {edf86ea6-5226-44ca-84cf-4998c10f013d} + {20dd9259-32b4-4f5b-9af8-c689a12627ec} .;.h - {50010e83-45c3-4942-a66b-d959d7f4a15f} + {9a225122-4fcd-43c9-868a-6caf0dd272ce} @@ -580,18 +580,6 @@ Header Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj index 24f58f28c..2488aa6aa 100644 --- a/VC2013/Lua.vcxproj +++ b/VC2013/Lua.vcxproj @@ -1,4 +1,4 @@ - + diff --git a/VC2013/Lua.vcxproj.filters b/VC2013/Lua.vcxproj.filters index 8615188bd..21cc86850 100644 --- a/VC2013/Lua.vcxproj.filters +++ b/VC2013/Lua.vcxproj.filters @@ -31,7 +31,7 @@ Source Files - + Source Files 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 + + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index aecbcd557..1f213b900 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -10,73 +10,73 @@ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - {57050e42-039e-409c-83e7-1cc43de721bf} + {0c1dd2bf-04b0-4605-b963-b187e900b4a1} - {7196f6a0-ca4c-4ec0-aaae-b4d130093042} + {5c101216-8e22-4ad4-a27d-1572a4d95947} - {81a47e51-ed9b-484b-b8c0-2d089333846a} + {eb7a158f-f532-4db5-9314-fca01f04a38e} - {05094067-abbe-4828-ba59-cb4b6d904d42} + {c378fbaa-2232-4123-a58d-84f2e2e32376} - {79ed96f3-5cb6-4e5d-b13a-477c45dedf2a} + {be34fc66-075c-45f0-a292-e4ace73a5726} - {dcdcdac7-addc-4ff4-a728-b47992b8865f} + {8dcfacbc-454b-4530-af61-d9db5aebb5bd} - {00f82410-3b82-4104-8a8e-2fab52718f83} + {3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15} - {ffcc04a7-82d0-4107-96eb-18fb7bcc3dcb} + {50cbaa98-dc12-4cc9-9ba6-4e08e885c924} - {2c7fa1c0-770e-45e5-87fc-31747131fe6c} + {889b7953-c303-448a-8cf9-ca624011d131} - {1b2c7b1c-9062-4f04-b234-7015a267696b} + {9313323e-633a-4c87-812c-0dda81b2a509} - {b2a07d02-27fb-42b7-9781-3372b03e1a49} + {61f1ea93-c0b0-4296-81fa-808116542dc8} - {84f254f6-92fc-4734-b767-ea8b92970e16} + {61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6} - {0231c881-e8fc-4372-a820-a2af33f63ad2} + {86f6a355-fd04-4ba5-82b0-0fb57897da8d} - {4ec2206a-9706-40d1-af41-5fc270046963} + {dacfe6a2-94db-4257-8727-0f9a8c70fc8f} - {97f08ad3-5335-411b-9718-4862e80ccde9} + {b41f78d8-61f8-4476-86cf-d08080418dcb} - {266dfb32-2e86-4fb8-b20e-17351fb66385} + {78f41ac0-8ed5-4951-8373-2aed18d9c741} - {6eb82dc3-52a0-437f-9ed9-2af6acdfcaff} + {fc1463dd-e130-49cb-96cf-ee6755cf2de1} - {78a8ea69-767d-40a9-b2bc-2385ca9b3184} + {a50ba11b-40c8-43ff-aa5b-aac2e4285df0} - {3db4dd37-ed4c-4237-8c87-3174ab508e2b} + {37df6f7f-93ff-4c4a-89cf-77bb6feb215f} - {bbd7243f-5abd-411e-82f8-11b4d00d4c42} + {3d8e534e-8cd7-4dc5-9626-a1ce9559c118} - {04cebff1-aaff-4550-8545-603c7bb28662} + {4419315f-3ef3-490d-ba0a-df22565b9a02} - {914562fa-6de0-4ebd-9544-6d2f1ab30b2f} + {3491f495-c715-4a5b-845e-1638a4ef0127} - {300d9995-b846-4b76-9a91-9600805ef621} + {4bb6b059-2004-4795-a0e7-d401affb3063} @@ -513,7 +513,7 @@ Source Files\Bindings - + Source Files\External @@ -1474,7 +1474,7 @@ Source Files\Bindings - + Source Files\External diff --git a/VC2013/ToLua.vcxproj b/VC2013/ToLua.vcxproj index 4f4b8875d..c798af657 100644 --- a/VC2013/ToLua.vcxproj +++ b/VC2013/ToLua.vcxproj @@ -84,7 +84,7 @@ Disabled - ../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories) + ../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -98,7 +98,7 @@ MaxSpeed true - ../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories) + ../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded true @@ -111,7 +111,7 @@ MaxSpeed true - ../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories) + ../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded true @@ -123,7 +123,7 @@ Disabled - ../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories) + ../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/lib/tolua++/include/tolua++.h b/lib/tolua++/include/tolua++.h index a60dde635..3ebd8d246 100644 --- a/lib/tolua++/include/tolua++.h +++ b/lib/tolua++/include/tolua++.h @@ -43,7 +43,7 @@ extern "C" { typedef int lua_Object; -#include "../../lua/src/lua.h +#include "../../lua/src/lua.h" #include "../../lua/src/lauxlib.h" struct tolua_Error