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/CryptoPP.vcxproj.filters | 6 ++--- VC2013/MCServer.vcxproj | 12 ++++++--- VC2013/MCServer.vcxproj.filters | 58 +++++++++++++++++++++++++---------------- 3 files changed, 46 insertions(+), 30 deletions(-) (limited to 'VC2013') diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index 793db552c..ba7db9584 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,15 +2,15 @@ - {21031ece-70f0-4aa6-9069-6947175663ea} + {a4186d1f-f2a9-4b49-b13b-a710ef40a767} .cpp - {20dd9259-32b4-4f5b-9af8-c689a12627ec} + {56d100a3-fe61-4f9d-b7c1-b750a9faf1b1} .;.h - {9a225122-4fcd-43c9-868a-6caf0dd272ce} + {fd15b788-329a-459d-b675-9af86fbaa35a} 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 @@ + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index 1f213b900..d265d7ad6 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 - {0c1dd2bf-04b0-4605-b963-b187e900b4a1} + {d3e4f61e-bc56-4454-8036-8a546cf8fb0b} - {5c101216-8e22-4ad4-a27d-1572a4d95947} + {520ca259-2c9e-482f-9690-1768c4d29939} - {eb7a158f-f532-4db5-9314-fca01f04a38e} + {21ab8bcf-53a0-4eec-b597-db45d6cd8635} - {c378fbaa-2232-4123-a58d-84f2e2e32376} + {73debd14-b218-4313-9389-1a0e62dae8b7} - {be34fc66-075c-45f0-a292-e4ace73a5726} + {2cbd2a0f-6204-4ed6-a825-f9e81fe86d98} - {8dcfacbc-454b-4530-af61-d9db5aebb5bd} + {b80f90c1-713e-4c86-ab50-78d7f5aa6c82} - {3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15} + {d29f7a59-d5d7-4b06-bd73-563007f3a15a} - {50cbaa98-dc12-4cc9-9ba6-4e08e885c924} + {c8e6ce30-56d9-42b7-8a5d-0af0f1b8c5c6} - {889b7953-c303-448a-8cf9-ca624011d131} + {0aff46f9-2a5c-4e23-8227-6c7a318efd98} - {9313323e-633a-4c87-812c-0dda81b2a509} + {86cc1a62-5a4a-4b55-9919-c1944a2f17bc} - {61f1ea93-c0b0-4296-81fa-808116542dc8} + {6ae1cee3-6e6a-464e-806c-5dd353137bdd} - {61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6} + {2e9149ad-0762-42b6-9041-e23f83934380} - {86f6a355-fd04-4ba5-82b0-0fb57897da8d} + {43922b25-52e6-41e0-a534-0220c585fb64} - {dacfe6a2-94db-4257-8727-0f9a8c70fc8f} + {28ba3c86-6782-4b9c-8ad1-4815a9990f56} - {b41f78d8-61f8-4476-86cf-d08080418dcb} + {17718a17-83c9-4e37-9be9-a7974fae412c} - {78f41ac0-8ed5-4951-8373-2aed18d9c741} + {5f9cb95f-1a51-4962-ad30-09c5e43dd9ae} - {fc1463dd-e130-49cb-96cf-ee6755cf2de1} + {ee51cab4-2a1d-4fb2-9f33-ff5f42ee5c2c} - {a50ba11b-40c8-43ff-aa5b-aac2e4285df0} + {a4c0514f-61e0-4a3e-90af-aa92850a6cad} - {37df6f7f-93ff-4c4a-89cf-77bb6feb215f} + {cdc2d187-0019-4de2-8f76-d224bbda63ee} - {3d8e534e-8cd7-4dc5-9626-a1ce9559c118} + {9960d29d-8cdd-48a7-8f72-6abb7882e0f8} - {4419315f-3ef3-490d-ba0a-df22565b9a02} + {39ac0d09-047a-43f4-8472-d99ba62834e5} - {3491f495-c715-4a5b-845e-1638a4ef0127} + {7b6aed62-c48a-4c44-83ca-e459a16a6232} - {4bb6b059-2004-4795-a0e7-d401affb3063} + {4feccf69-36aa-4881-a844-7a6f8a9e8291} @@ -270,6 +270,9 @@ Source Files + + Source Files + Source Files @@ -381,6 +384,9 @@ Source Files\Entities + + Source Files\Entities + Source Files\Entities @@ -1246,6 +1252,9 @@ Source Files + + Source Files + Source Files @@ -1351,6 +1360,9 @@ Source Files\Entities + + Source Files\Entities + Source Files\Entities -- cgit v1.2.3