diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-25 22:32:09 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-11-25 22:32:09 +0100 |
| commit | 3466d2cad9a5723c327c3a64123b5321df968ba5 (patch) | |
| tree | ecf5599ed9c3a164da292aafa560b134382bda16 | |
| parent | Updated VS includes (diff) | |
| download | cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar.gz cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar.bz2 cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar.lz cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar.xz cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.tar.zst cuberite-3466d2cad9a5723c327c3a64123b5321df968ba5.zip | |
| -rw-r--r-- | VC2008/CryptoPP.vcproj | 30 | ||||
| -rw-r--r-- | VC2008/JsonCpp.vcproj | 12 | ||||
| -rw-r--r-- | VC2008/Lua.vcproj | 2 | ||||
| -rw-r--r-- | VC2008/MCServer.vcproj | 20 | ||||
| -rw-r--r-- | VC2008/ToLua.cbp | 12 | ||||
| -rw-r--r-- | VC2008/ToLua.vcproj | 8 | ||||
| -rw-r--r-- | VC2013/CryptoPP.vcxproj | 4 | ||||
| -rw-r--r-- | VC2013/CryptoPP.vcxproj.filters | 18 | ||||
| -rw-r--r-- | VC2013/Lua.vcxproj | 2 | ||||
| -rw-r--r-- | VC2013/Lua.vcxproj.filters | 2 | ||||
| -rw-r--r-- | VC2013/MCServer.vcxproj | 38 | ||||
| -rw-r--r-- | VC2013/MCServer.vcxproj.filters | 52 | ||||
| -rw-r--r-- | VC2013/ToLua.vcxproj | 8 | ||||
| -rw-r--r-- | 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 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\authenc.cpp" + RelativePath="..\lib\cryptopp\authenc.cpp" > </File> <File @@ -891,7 +891,7 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\ccm.cpp" + RelativePath="..\lib\cryptopp\ccm.cpp" > </File> <File @@ -951,11 +951,11 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\cmac.cpp" + RelativePath="..\lib\cryptopp\cmac.cpp" > </File> <File - RelativePath="..\lib\cryptopp\.\cpu.cpp" + RelativePath="..\lib\cryptopp\cpu.cpp" > </File> <File @@ -1365,7 +1365,7 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\eax.cpp" + RelativePath="..\lib\cryptopp\eax.cpp" > </File> <File @@ -1889,7 +1889,7 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\gcm.cpp" + RelativePath="..\lib\cryptopp\gcm.cpp" > </File> <File @@ -3870,7 +3870,7 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\seed.cpp" + RelativePath="..\lib\cryptopp\seed.cpp" > </File> <File @@ -4546,7 +4546,7 @@ </FileConfiguration> </File> <File - RelativePath="..\lib\cryptopp\.\vmac.cpp" + RelativePath="..\lib\cryptopp\vmac.cpp" > </File> <File @@ -4695,7 +4695,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\authenc.h" + RelativePath="..\lib\cryptopp\authenc.h" > </File> <File @@ -4715,7 +4715,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\ccm.h" + RelativePath="..\lib\cryptopp\ccm.h" > </File> <File @@ -4723,7 +4723,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\cmac.h" + RelativePath="..\lib\cryptopp\cmac.h" > </File> <File @@ -4731,7 +4731,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\cpu.h" + RelativePath="..\lib\cryptopp\cpu.h" > </File> <File @@ -4767,7 +4767,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\eax.h" + RelativePath="..\lib\cryptopp\eax.h" > </File> <File @@ -4815,7 +4815,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\gcm.h" + RelativePath="..\lib\cryptopp\gcm.h" > </File> <File @@ -5091,7 +5091,7 @@ > </File> <File - RelativePath="..\lib\cryptopp\.\Readme.txt" + RelativePath="..\lib\cryptopp\Readme.txt" > </File> </Filter> 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}" > <File - RelativePath="../lib/jsoncpp\src\lib_json\json_batchallocator.h" + RelativePath="..\lib\jsoncpp\src\lib_json\json_batchallocator.h" > </File> <File - RelativePath="../lib/jsoncpp\src\lib_json\json_internalarray.inl" + RelativePath="..\lib\jsoncpp\src\lib_json\json_internalarray.inl" > </File> <File - RelativePath="../lib/jsoncpp\src\lib_json\json_internalmap.inl" + RelativePath="..\lib\jsoncpp\src\lib_json\json_internalmap.inl" > </File> <File @@ -292,15 +292,15 @@ > </File> <File - RelativePath="../lib/jsoncpp\src\lib_json\json_value.cpp" + RelativePath="..\lib\jsoncpp\src\lib_json\json_value.cpp" > </File> <File - RelativePath="../lib/jsoncpp\src\lib_json\json_valueiterator.inl" + RelativePath="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl" > </File> <File - RelativePath="../lib/jsoncpp\src\lib_json\json_writer.cpp" + RelativePath="..\lib\jsoncpp\src\lib_json\json_writer.cpp" > </File> </Filter> 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 @@ > </File> <File - RelativePath="..\lib\luaO\src\lfunc.c" + RelativePath="..\lib\lua\src\lfunc.c" > </File> <File 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 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""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"" + AdditionalDependencies=""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"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1696,7 +1696,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""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"" + AdditionalDependencies=""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"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1707,7 +1707,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""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"" + AdditionalDependencies=""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"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1718,7 +1718,7 @@ <Tool Name="VCCustomBuildTool" CommandLine="GenerateBindings.cmd
" - AdditionalDependencies=""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"" + AdditionalDependencies=""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"" Outputs="Bindings.cpp" /> </FileConfiguration> @@ -1840,11 +1840,11 @@ Name="External" > <File - RelativePath="..\iniFile\iniFile.cpp" + RelativePath="..\lib\inifile\iniFile.cpp" > </File> <File - RelativePath="..\iniFile\iniFile.h" + RelativePath="..\lib\inifile\iniFile.h" > </File> <File diff --git a/VC2008/ToLua.cbp b/VC2008/ToLua.cbp index 2466a9503..c7f24afcc 100644 --- a/VC2008/ToLua.cbp +++ b/VC2008/ToLua.cbp @@ -22,11 +22,11 @@ <Add option="-g" /> <Add option="-O0" /> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </Compiler> <ResourceCompiler> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </ResourceCompiler> </Target> <Target title="Release Win32"> @@ -44,11 +44,11 @@ <Add option="-W" /> <Add option="-O2" /> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </Compiler> <ResourceCompiler> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </ResourceCompiler> </Target> <Target title="Release profiled Win32"> @@ -66,11 +66,11 @@ <Add option="-W" /> <Add option="-O2" /> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </Compiler> <ResourceCompiler> <Add directory="../lib/tolua++/include" /> - <Add directory="../lua-5.1.4/src" /> + <Add directory="../lib/lua/src" /> </ResourceCompiler> </Target> </Build> 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 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src" + AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -105,7 +105,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src" + AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -168,7 +168,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src" + AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -229,7 +229,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src" + AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj index 4a7898e4a..7355ab64b 100644 --- a/VC2013/CryptoPP.vcxproj +++ b/VC2013/CryptoPP.vcxproj @@ -814,7 +814,6 @@ <ClInclude Include="..\lib\cryptopp\des.h" /> <ClInclude Include="..\lib\cryptopp\dh.h" /> <ClInclude Include="..\lib\cryptopp\dh2.h" /> - <ClInclude Include="..\lib\cryptopp\dll.h" /> <ClInclude Include="..\lib\cryptopp\dmac.h" /> <ClInclude Include="..\lib\cryptopp\dsa.h" /> <ClInclude Include="..\lib\cryptopp\eax.h" /> @@ -825,7 +824,6 @@ <ClInclude Include="..\lib\cryptopp\emsa2.h" /> <ClInclude Include="..\lib\cryptopp\eprecomp.h" /> <ClInclude Include="..\lib\cryptopp\esign.h" /> - <ClInclude Include="..\lib\cryptopp\factory.h" /> <ClInclude Include="..\lib\cryptopp\files.h" /> <ClInclude Include="..\lib\cryptopp\filters.h" /> <ClInclude Include="..\lib\cryptopp\fips140.h" /> @@ -868,7 +866,6 @@ <ClInclude Include="..\lib\cryptopp\queue.h" /> <ClInclude Include="..\lib\cryptopp\rabin.h" /> <ClInclude Include="..\lib\cryptopp\randpool.h" /> - <ClInclude Include="..\lib\cryptopp\resource.h" /> <ClInclude Include="..\lib\cryptopp\rijndael.h" /> <ClInclude Include="..\lib\cryptopp\rng.h" /> <ClInclude Include="..\lib\cryptopp\rsa.h" /> @@ -891,7 +888,6 @@ <ClInclude Include="..\lib\cryptopp\trdlocal.h" /> <ClInclude Include="..\lib\cryptopp\trunhash.h" /> <ClInclude Include="..\lib\cryptopp\ttmac.h" /> - <ClInclude Include="..\lib\cryptopp\validate.h" /> <ClInclude Include="..\lib\cryptopp\vmac.h" /> <ClInclude Include="..\lib\cryptopp\wait.h" /> <ClInclude Include="..\lib\cryptopp\wake.h" /> 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 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{a8e36eec-ccdc-4b5d-acfa-59253ad7d84d}</UniqueIdentifier> + <UniqueIdentifier>{21031ece-70f0-4aa6-9069-6947175663ea}</UniqueIdentifier> <Extensions>.cpp</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{edf86ea6-5226-44ca-84cf-4998c10f013d}</UniqueIdentifier> + <UniqueIdentifier>{20dd9259-32b4-4f5b-9af8-c689a12627ec}</UniqueIdentifier> <Extensions>.;.h</Extensions> </Filter> <Filter Include="Miscellaneous"> - <UniqueIdentifier>{50010e83-45c3-4942-a66b-d959d7f4a15f}</UniqueIdentifier> + <UniqueIdentifier>{9a225122-4fcd-43c9-868a-6caf0dd272ce}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -580,18 +580,6 @@ <ClInclude Include="..\lib\cryptopp\words.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\lib\cryptopp\dll.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="..\lib\cryptopp\factory.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="..\lib\cryptopp\resource.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="..\lib\cryptopp\validate.h"> - <Filter>Source Files</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\lib\cryptopp\Doxyfile"> 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 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug profiled|Win32"> 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 @@ <ClCompile Include="..\lib\lua\src\ldump.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\lib\luaO\src\lfunc.c"> + <ClCompile Include="..\lib\lua\src\lfunc.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\lib\lua\src\lgc.c"> 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 @@ <ClInclude Include="..\src\tolua++.h" /> <ClInclude Include="..\src\tolua_base.h" /> <ClInclude Include="..\src\WebPlugin.h" /> - <ClInclude Include="..\lib\iniFile\iniFile.h" /> + <ClInclude Include="..\lib\inifile\iniFile.h" /> <ClInclude Include="..\lib\md5\md5.h" /> <ClInclude Include="..\src\WorldStorage\FastNBT.h" /> <ClInclude Include="..\src\WorldStorage\NBTChunkSerializer.h" /> @@ -492,22 +492,22 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild> <Command Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">GenerateBindings.cmd </Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">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)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">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)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Bindings.cpp;%(Outputs)</Outputs> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GenerateBindings.cmd </Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Bindings.cpp;%(Outputs)</Outputs> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild> <Command Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">GenerateBindings.cmd </Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">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)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">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)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">Bindings.cpp;%(Outputs)</Outputs> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GenerateBindings.cmd </Command> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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)</AdditionalInputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Bindings.cpp;%(Outputs)</Outputs> </CustomBuild> <None Include="..\MCServer\groups.ini" /> @@ -754,7 +754,7 @@ <ClCompile Include="..\src\PluginLua.cpp" /> <ClCompile Include="..\src\PluginManager.cpp" /> <ClCompile Include="..\src\WebPlugin.cpp" /> - <ClCompile Include="..\lib\iniFile\iniFile.cpp" /> + <ClCompile Include="..\lib\inifile\iniFile.cpp" /> <ClCompile Include="..\lib\md5\md5.cpp"> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> @@ -861,6 +861,32 @@ <Text Include="..\MCServer\crafting.txt" /> <Text Include="..\MCServer\furnace.txt" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="CryptoPP.vcxproj"> + <Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="expat.vcxproj"> + <Project>{5fcfaf8d-ff2c-456d-a72c-1d76f913ad96}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="JsonCpp.vcxproj"> + <Project>{5aaa90b9-946d-4034-83f3-676b06a6e326}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="Lua.vcxproj"> + <Project>{082e8185-7b3a-4945-8c82-9132341a329d}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="ToLua.vcxproj"> + <Project>{eeab54ad-114c-4ab8-8482-0a52d502bd35}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="zlib.vcxproj"> + <Project>{ea9d50fd-937a-4ef5-8c37-5f4175af4fea}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> 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 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Resource Files"> @@ -10,73 +10,73 @@ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> </Filter> <Filter Include="Source Files\Mobs"> - <UniqueIdentifier>{57050e42-039e-409c-83e7-1cc43de721bf}</UniqueIdentifier> + <UniqueIdentifier>{0c1dd2bf-04b0-4605-b963-b187e900b4a1}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Entities"> - <UniqueIdentifier>{7196f6a0-ca4c-4ec0-aaae-b4d130093042}</UniqueIdentifier> + <UniqueIdentifier>{5c101216-8e22-4ad4-a27d-1572a4d95947}</UniqueIdentifier> </Filter> <Filter Include="Source Files\UI"> - <UniqueIdentifier>{81a47e51-ed9b-484b-b8c0-2d089333846a}</UniqueIdentifier> + <UniqueIdentifier>{eb7a158f-f532-4db5-9314-fca01f04a38e}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Simulator"> - <UniqueIdentifier>{05094067-abbe-4828-ba59-cb4b6d904d42}</UniqueIdentifier> + <UniqueIdentifier>{c378fbaa-2232-4123-a58d-84f2e2e32376}</UniqueIdentifier> </Filter> <Filter Include="Source Files\OSSupport"> - <UniqueIdentifier>{79ed96f3-5cb6-4e5d-b13a-477c45dedf2a}</UniqueIdentifier> + <UniqueIdentifier>{be34fc66-075c-45f0-a292-e4ace73a5726}</UniqueIdentifier> </Filter> <Filter Include="Source Files\OSSupport\Android Specific"> - <UniqueIdentifier>{dcdcdac7-addc-4ff4-a728-b47992b8865f}</UniqueIdentifier> + <UniqueIdentifier>{8dcfacbc-454b-4530-af61-d9db5aebb5bd}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Bindings"> - <UniqueIdentifier>{00f82410-3b82-4104-8a8e-2fab52718f83}</UniqueIdentifier> + <UniqueIdentifier>{3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15}</UniqueIdentifier> </Filter> <Filter Include="Source Files\External"> - <UniqueIdentifier>{ffcc04a7-82d0-4107-96eb-18fb7bcc3dcb}</UniqueIdentifier> + <UniqueIdentifier>{50cbaa98-dc12-4cc9-9ba6-4e08e885c924}</UniqueIdentifier> </Filter> <Filter Include="Source Files\WorldStorage"> - <UniqueIdentifier>{2c7fa1c0-770e-45e5-87fc-31747131fe6c}</UniqueIdentifier> + <UniqueIdentifier>{889b7953-c303-448a-8cf9-ca624011d131}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Generating"> - <UniqueIdentifier>{1b2c7b1c-9062-4f04-b234-7015a267696b}</UniqueIdentifier> + <UniqueIdentifier>{9313323e-633a-4c87-812c-0dda81b2a509}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Blocks"> - <UniqueIdentifier>{b2a07d02-27fb-42b7-9781-3372b03e1a49}</UniqueIdentifier> + <UniqueIdentifier>{61f1ea93-c0b0-4296-81fa-808116542dc8}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Items"> - <UniqueIdentifier>{84f254f6-92fc-4734-b767-ea8b92970e16}</UniqueIdentifier> + <UniqueIdentifier>{61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Protocol"> - <UniqueIdentifier>{0231c881-e8fc-4372-a820-a2af33f63ad2}</UniqueIdentifier> + <UniqueIdentifier>{86f6a355-fd04-4ba5-82b0-0fb57897da8d}</UniqueIdentifier> </Filter> <Filter Include="Source Files\SQLite"> - <UniqueIdentifier>{4ec2206a-9706-40d1-af41-5fc270046963}</UniqueIdentifier> + <UniqueIdentifier>{dacfe6a2-94db-4257-8727-0f9a8c70fc8f}</UniqueIdentifier> </Filter> <Filter Include="Source Files\LuaExpat"> - <UniqueIdentifier>{97f08ad3-5335-411b-9718-4862e80ccde9}</UniqueIdentifier> + <UniqueIdentifier>{b41f78d8-61f8-4476-86cf-d08080418dcb}</UniqueIdentifier> </Filter> <Filter Include="Source Files\BlockEntities"> - <UniqueIdentifier>{266dfb32-2e86-4fb8-b20e-17351fb66385}</UniqueIdentifier> + <UniqueIdentifier>{78f41ac0-8ed5-4951-8373-2aed18d9c741}</UniqueIdentifier> </Filter> <Filter Include="Source Files\HTTPServer"> - <UniqueIdentifier>{6eb82dc3-52a0-437f-9ed9-2af6acdfcaff}</UniqueIdentifier> + <UniqueIdentifier>{fc1463dd-e130-49cb-96cf-ee6755cf2de1}</UniqueIdentifier> </Filter> <Filter Include="Config files"> - <UniqueIdentifier>{78a8ea69-767d-40a9-b2bc-2385ca9b3184}</UniqueIdentifier> + <UniqueIdentifier>{a50ba11b-40c8-43ff-aa5b-aac2e4285df0}</UniqueIdentifier> </Filter> <Filter Include="Plugins"> - <UniqueIdentifier>{3db4dd37-ed4c-4237-8c87-3174ab508e2b}</UniqueIdentifier> + <UniqueIdentifier>{37df6f7f-93ff-4c4a-89cf-77bb6feb215f}</UniqueIdentifier> </Filter> <Filter Include="Plugins\Core"> - <UniqueIdentifier>{bbd7243f-5abd-411e-82f8-11b4d00d4c42}</UniqueIdentifier> + <UniqueIdentifier>{3d8e534e-8cd7-4dc5-9626-a1ce9559c118}</UniqueIdentifier> </Filter> <Filter Include="Plugins\ChatLog"> - <UniqueIdentifier>{04cebff1-aaff-4550-8545-603c7bb28662}</UniqueIdentifier> + <UniqueIdentifier>{4419315f-3ef3-490d-ba0a-df22565b9a02}</UniqueIdentifier> </Filter> <Filter Include="Plugins\Debuggers"> - <UniqueIdentifier>{914562fa-6de0-4ebd-9544-6d2f1ab30b2f}</UniqueIdentifier> + <UniqueIdentifier>{3491f495-c715-4a5b-845e-1638a4ef0127}</UniqueIdentifier> </Filter> <Filter Include="Plugins\APIDump"> - <UniqueIdentifier>{300d9995-b846-4b76-9a91-9600805ef621}</UniqueIdentifier> + <UniqueIdentifier>{4bb6b059-2004-4795-a0e7-d401affb3063}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -513,7 +513,7 @@ <ClInclude Include="..\src\WebPlugin.h"> <Filter>Source Files\Bindings</Filter> </ClInclude> - <ClInclude Include="..\lib\iniFile\iniFile.h"> + <ClInclude Include="..\lib\inifile\iniFile.h"> <Filter>Source Files\External</Filter> </ClInclude> <ClInclude Include="..\lib\md5\md5.h"> @@ -1474,7 +1474,7 @@ <ClCompile Include="..\src\WebPlugin.cpp"> <Filter>Source Files\Bindings</Filter> </ClCompile> - <ClCompile Include="..\lib\iniFile\iniFile.cpp"> + <ClCompile Include="..\lib\inifile\iniFile.cpp"> <Filter>Source Files\External</Filter> </ClCompile> <ClCompile Include="..\lib\md5\md5.cpp"> 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 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -98,7 +98,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -111,7 +111,7 @@ <ClCompile> <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -123,7 +123,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> 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 |