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/.gitignore | 1 + VC2013/CryptoPP.vcproj | 5101 +++++++++++++++++++++++++++++++++++++++ VC2013/CryptoPP.vcxproj | 384 +-- VC2013/CryptoPP.vcxproj.filters | 390 +-- VC2013/GenerateBindings.cmd | 3 + VC2013/JsonCpp.vcproj | 310 +++ VC2013/JsonCpp.vcxproj | 14 +- VC2013/JsonCpp.vcxproj.filters | 14 +- VC2013/Lua.vcproj | 498 ++++ VC2013/Lua.vcxproj | 110 +- VC2013/Lua.vcxproj.filters | 110 +- VC2013/MCServer.ipgset | 317 --- VC2013/MCServer.sln | 10 +- VC2013/MCServer.vcproj | 3059 +++++++++++++++++++++++ VC2013/MCServer.vcxproj | 964 ++++---- VC2013/MCServer.vcxproj.filters | 977 ++++---- VC2013/ToLua.vcproj | 310 +++ VC2013/ToLua.vcxproj | 14 +- VC2013/ToLua.vcxproj.filters | 14 +- VC2013/expat.vcproj | 227 ++ VC2013/expat.vcxproj | 36 +- VC2013/expat.vcxproj.filters | 36 +- VC2013/zlib.vcproj | 386 +++ VC2013/zlib.vcxproj | 52 +- VC2013/zlib.vcxproj.filters | 52 +- 25 files changed, 11467 insertions(+), 1922 deletions(-) create mode 100644 VC2013/CryptoPP.vcproj create mode 100644 VC2013/GenerateBindings.cmd create mode 100644 VC2013/JsonCpp.vcproj create mode 100644 VC2013/Lua.vcproj delete mode 100644 VC2013/MCServer.ipgset create mode 100644 VC2013/MCServer.vcproj create mode 100644 VC2013/ToLua.vcproj create mode 100644 VC2013/expat.vcproj create mode 100644 VC2013/zlib.vcproj (limited to 'VC2013') diff --git a/VC2013/.gitignore b/VC2013/.gitignore index 9d46443bd..8e2fd484d 100644 --- a/VC2013/.gitignore +++ b/VC2013/.gitignore @@ -8,3 +8,4 @@ ipch/** *.suo *.obj *.sdf +*.opensdf \ No newline at end of file diff --git a/VC2013/CryptoPP.vcproj b/VC2013/CryptoPP.vcproj new file mode 100644 index 000000000..44f5f226c --- /dev/null +++ b/VC2013/CryptoPP.vcproj @@ -0,0 +1,5101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj index 0d7ef9774..7355ab64b 100644 --- a/VC2013/CryptoPP.vcxproj +++ b/VC2013/CryptoPP.vcxproj @@ -289,97 +289,97 @@ - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - - - + + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - - + + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled @@ -397,20 +397,20 @@ - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + true Disabled true @@ -422,20 +422,20 @@ true true - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + true Disabled true @@ -447,74 +447,74 @@ true true - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled @@ -522,7 +522,7 @@ - + Disabled @@ -540,79 +540,79 @@ - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled Create MaxSpeed @@ -624,166 +624,166 @@ Create Create - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled Disabled - - + + Disabled MaxSpeed Disabled Disabled - + Disabled MaxSpeed Disabled @@ -791,116 +791,116 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index 2a56447c6..f066c5ef4 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,598 +2,598 @@ - {66d19353-af6a-4f52-9546-f52f44dd13cc} + {a8e36eec-ccdc-4b5d-acfa-59253ad7d84d} .cpp - {512ceb0e-67f5-47b1-b19b-59352a5e0785} + {edf86ea6-5226-44ca-84cf-4998c10f013d} .;.h - {b7c7d4fa-281f-482d-be38-d8106878975c} + {50010e83-45c3-4942-a66b-d959d7f4a15f} - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Miscellaneous - + Miscellaneous - + Miscellaneous - + Miscellaneous diff --git a/VC2013/GenerateBindings.cmd b/VC2013/GenerateBindings.cmd new file mode 100644 index 000000000..1ee0f3bf0 --- /dev/null +++ b/VC2013/GenerateBindings.cmd @@ -0,0 +1,3 @@ +set ALLTOLUA_WAIT=N +cd ..\src +AllToLua.bat \ No newline at end of file diff --git a/VC2013/JsonCpp.vcproj b/VC2013/JsonCpp.vcproj new file mode 100644 index 000000000..577507d50 --- /dev/null +++ b/VC2013/JsonCpp.vcproj @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/JsonCpp.vcxproj b/VC2013/JsonCpp.vcxproj index c1490d4bb..f1dd1c7b5 100644 --- a/VC2013/JsonCpp.vcxproj +++ b/VC2013/JsonCpp.vcxproj @@ -134,17 +134,17 @@ - + - - - + + + - - - + + + diff --git a/VC2013/JsonCpp.vcxproj.filters b/VC2013/JsonCpp.vcxproj.filters index cf8ea5d00..b46dae3fd 100644 --- a/VC2013/JsonCpp.vcxproj.filters +++ b/VC2013/JsonCpp.vcxproj.filters @@ -7,29 +7,29 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/VC2013/Lua.vcproj b/VC2013/Lua.vcproj new file mode 100644 index 000000000..a21dadc66 --- /dev/null +++ b/VC2013/Lua.vcproj @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj index 453ccb984..d4395b2d2 100644 --- a/VC2013/Lua.vcxproj +++ b/VC2013/Lua.vcxproj @@ -130,63 +130,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/Lua.vcxproj.filters b/VC2013/Lua.vcxproj.filters index 0ddb91719..8615188bd 100644 --- a/VC2013/Lua.vcxproj.filters +++ b/VC2013/Lua.vcxproj.filters @@ -7,126 +7,126 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VC2013/MCServer.ipgset b/VC2013/MCServer.ipgset deleted file mode 100644 index 16f00e1ca..000000000 --- a/VC2013/MCServer.ipgset +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - PerformanceGuide - - false - false - false - false - false - - - - Introduction - - false - true - false - false - false - - - - GettingStarted - - false - true - true - false - false - - - - GetPerformanceBaseline - - true - false - false - false - false - - - - CheckPerfBaseline - - false - false - true - false - false - - - - ProfileApp - - false - false - false - false - false - - - - ReviewHotspots - - false - false - true - false - false - - - - UseIntelCompiler - - false - false - false - false - false - - - - SelectFilesForIntelC - - false - false - false - false - false - - - - GetPerformanceProgressWithIntelC - - false - false - false - false - false - - - - CheckPerfProgressIntelC - - false - false - true - false - false - - - - DetermineIntelCompilerOptions - - false - false - false - false - false - - - - GetPerformanceProgressWithNewOptions - - false - false - false - false - false - - - - CheckPerfProgressNewOptions - - false - false - true - false - false - - - - UseGAP - - false - false - false - false - false - - - - ReviewGAPAdvice - - false - false - true - false - false - - - - GetPerformanceProgressWithGAP - - false - false - false - false - false - - - - CheckPerfProgressGAP - - false - false - true - false - false - - - - UsePGO - - false - false - false - false - false - - - - CheckPerfProgressPGO - - false - false - true - false - false - - - - ContinueOptimizations - - false - false - false - false - false - - - - ParallelAmplifier - - false - false - true - false - false - - - - ParallelAdvisor - - false - false - true - false - false - - - - Summary - - false - false - false - false - false - - - - - false - - - false - - false - - - - Image Color Conversion - true - - - Symmetric Cryptography - true - - - One-Way Hash Primitives - true - - - Public Key Cryptography - true - - - Image Geometry Transforms - true - - - Image Compression - true - - - Video Coding - true - - - Computer Vision - true - - - Data Integrity - true - - - Digital Signal Processing - true - - - Speech And Telephony Encode/Decode - true - - - Data Compression - true - - - Audio Coding - true - - - true - - 0 - - - true - - true - - \ No newline at end of file diff --git a/VC2013/MCServer.sln b/VC2013/MCServer.sln index d122a0d48..9dcfc802e 100644 --- a/VC2013/MCServer.sln +++ b/VC2013/MCServer.sln @@ -1,16 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 +# Visual Studio Express 2013 for Windows Desktop VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcxproj", "{32012054-0C96-4C43-AB27-174FF8E72D66}" - ProjectSection(ProjectDependencies) = postProject - {082E8185-7B3A-4945-8C82-9132341A329D} = {082E8185-7B3A-4945-8C82-9132341A329D} - {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96} = {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96} - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} - {EEAB54AD-114C-4AB8-8482-0A52D502BD35} = {EEAB54AD-114C-4AB8-8482-0A52D502BD35} - {5AAA90B9-946D-4034-83F3-676B06A6E326} = {5AAA90B9-946D-4034-83F3-676B06A6E326} - {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}" EndProject diff --git a/VC2013/MCServer.vcproj b/VC2013/MCServer.vcproj new file mode 100644 index 000000000..1b710e1e4 --- /dev/null +++ b/VC2013/MCServer.vcproj @@ -0,0 +1,3059 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 - - diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index c37f00958..348c725f6 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 - {74c155c0-0f2d-4d4d-bf75-cc60408854f9} + {57050e42-039e-409c-83e7-1cc43de721bf} - {0e9000fa-a1b6-4899-b0fb-66d8daa8c0e5} + {7196f6a0-ca4c-4ec0-aaae-b4d130093042} - {a9d61705-26a1-4f89-ab9c-d73286417d25} + {81a47e51-ed9b-484b-b8c0-2d089333846a} - {6f57d9e4-3758-4a17-a3a4-fd8ee5f9e398} + {05094067-abbe-4828-ba59-cb4b6d904d42} - {b58a4bc8-5be3-438d-8c21-bc56db2e66d2} + {79ed96f3-5cb6-4e5d-b13a-477c45dedf2a} - {6f4125b6-47ff-4de0-8294-839dab538b65} + {dcdcdac7-addc-4ff4-a728-b47992b8865f} - {6fe6ae96-c1aa-4968-b4ef-9d6f8c3f2888} + {00f82410-3b82-4104-8a8e-2fab52718f83} - {30704df7-b1ff-4bfc-aedf-afe4afcada3f} + {ffcc04a7-82d0-4107-96eb-18fb7bcc3dcb} - {0a54250c-fdb6-4b65-9102-20cd793a9b78} + {2c7fa1c0-770e-45e5-87fc-31747131fe6c} - {bea06b59-4fed-4e7f-ac87-2e9c0a1b6d27} + {1b2c7b1c-9062-4f04-b234-7015a267696b} - {a5a43ccd-e85d-4723-9c8a-3f83c730f597} + {b2a07d02-27fb-42b7-9781-3372b03e1a49} - {b5f65bf0-470c-4c3c-9777-a7f3b79b8166} + {84f254f6-92fc-4734-b767-ea8b92970e16} - {95e9878e-81c3-4b84-aa1c-d464d2a95883} + {0231c881-e8fc-4372-a820-a2af33f63ad2} - {a67840b7-95ac-447f-9f23-d779aeaf5f49} + {4ec2206a-9706-40d1-af41-5fc270046963} - {bee4489c-556e-4eff-876e-b46b16eb33dc} + {97f08ad3-5335-411b-9718-4862e80ccde9} - {28f497b8-c75d-44e6-8e0c-8617cb56eb37} + {266dfb32-2e86-4fb8-b20e-17351fb66385} - {a9725758-b517-4602-a8e1-ffb950215db8} + {6eb82dc3-52a0-437f-9ed9-2af6acdfcaff} - {ab501743-5b5d-449e-8ed7-bc823368a58c} + {78a8ea69-767d-40a9-b2bc-2385ca9b3184} - {baf72963-ce16-452e-80b2-a653fe04b25a} + {3db4dd37-ed4c-4237-8c87-3174ab508e2b} - {05040adb-d357-4712-b326-d8cad05f6e40} + {bbd7243f-5abd-411e-82f8-11b4d00d4c42} - {f2962218-2274-4d13-bd40-ff09c634ae1f} + {04cebff1-aaff-4550-8545-603c7bb28662} - {ad918b66-c94a-4c54-ad79-6733424e8083} + {914562fa-6de0-4ebd-9544-6d2f1ab30b2f} - {7f151cf3-a835-4e77-9c43-0a3d4bd02714} + {300d9995-b846-4b76-9a91-9600805ef621} @@ -93,847 +93,847 @@ Resource Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\UI - + Source Files\UI - + Source Files\UI - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings Source Files\External - + Source Files\External - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Items - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\SQLite - + Source Files\LuaExpat - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer @@ -1096,352 +1096,352 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Mobs - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\Entities - + Source Files\UI - + Source Files\UI - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\Simulator - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport - + Source Files\OSSupport @@ -1450,205 +1450,208 @@ Source Files\OSSupport\Android Specific - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings - + Source Files\Bindings Source Files\External - + Source Files\External - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\WorldStorage - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Generating - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Blocks - + Source Files\Items - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\Protocol - + Source Files\SQLite - + Source Files\SQLite - + Source Files\LuaExpat - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + Source Files\BlockEntities - + + Source Files\BlockEntities + + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer - + Source Files\HTTPServer @@ -1656,7 +1659,7 @@ Source Files\Bindings - + Source Files\SQLite @@ -1676,7 +1679,7 @@ Source Files\OSSupport\Android Specific - + Source Files\Bindings diff --git a/VC2013/ToLua.vcproj b/VC2013/ToLua.vcproj new file mode 100644 index 000000000..f174ba528 --- /dev/null +++ b/VC2013/ToLua.vcproj @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/ToLua.vcxproj b/VC2013/ToLua.vcxproj index cd032d3b3..4f4b8875d 100644 --- a/VC2013/ToLua.vcxproj +++ b/VC2013/ToLua.vcxproj @@ -134,15 +134,15 @@ - - - - - - + + + + + + - + diff --git a/VC2013/ToLua.vcxproj.filters b/VC2013/ToLua.vcxproj.filters index 719b59c0d..5d104d7d0 100644 --- a/VC2013/ToLua.vcxproj.filters +++ b/VC2013/ToLua.vcxproj.filters @@ -7,27 +7,27 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/VC2013/expat.vcproj b/VC2013/expat.vcproj new file mode 100644 index 000000000..a02549192 --- /dev/null +++ b/VC2013/expat.vcproj @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/expat.vcxproj b/VC2013/expat.vcxproj index 3049b972a..388bf6158 100644 --- a/VC2013/expat.vcxproj +++ b/VC2013/expat.vcxproj @@ -73,26 +73,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + diff --git a/VC2013/expat.vcxproj.filters b/VC2013/expat.vcxproj.filters index 34cf0b3b6..4cb4220c9 100644 --- a/VC2013/expat.vcxproj.filters +++ b/VC2013/expat.vcxproj.filters @@ -7,60 +7,60 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/VC2013/zlib.vcproj b/VC2013/zlib.vcproj new file mode 100644 index 000000000..1e07afc4c --- /dev/null +++ b/VC2013/zlib.vcproj @@ -0,0 +1,386 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2013/zlib.vcxproj b/VC2013/zlib.vcxproj index d00064bf2..3aeacf329 100644 --- a/VC2013/zlib.vcxproj +++ b/VC2013/zlib.vcxproj @@ -134,34 +134,34 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/VC2013/zlib.vcxproj.filters b/VC2013/zlib.vcxproj.filters index 73223e924..192806a9f 100644 --- a/VC2013/zlib.vcxproj.filters +++ b/VC2013/zlib.vcxproj.filters @@ -7,84 +7,84 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files -- cgit v1.2.3 From a92f475a7575f99c75a1718a53b9db89776f7d6d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 24 Nov 2013 17:31:53 +0000 Subject: Removed old project files --- VC2013/CryptoPP.vcproj | 5101 ------------------------------------------------ VC2013/JsonCpp.vcproj | 310 --- VC2013/Lua.vcproj | 498 ----- VC2013/MCServer.vcproj | 3059 ----------------------------- VC2013/ToLua.vcproj | 310 --- VC2013/expat.vcproj | 227 --- VC2013/zlib.vcproj | 386 ---- 7 files changed, 9891 deletions(-) delete mode 100644 VC2013/CryptoPP.vcproj delete mode 100644 VC2013/JsonCpp.vcproj delete mode 100644 VC2013/Lua.vcproj delete mode 100644 VC2013/MCServer.vcproj delete mode 100644 VC2013/ToLua.vcproj delete mode 100644 VC2013/expat.vcproj delete mode 100644 VC2013/zlib.vcproj (limited to 'VC2013') diff --git a/VC2013/CryptoPP.vcproj b/VC2013/CryptoPP.vcproj deleted file mode 100644 index 44f5f226c..000000000 --- a/VC2013/CryptoPP.vcproj +++ /dev/null @@ -1,5101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/JsonCpp.vcproj b/VC2013/JsonCpp.vcproj deleted file mode 100644 index 577507d50..000000000 --- a/VC2013/JsonCpp.vcproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/Lua.vcproj b/VC2013/Lua.vcproj deleted file mode 100644 index a21dadc66..000000000 --- a/VC2013/Lua.vcproj +++ /dev/null @@ -1,498 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/MCServer.vcproj b/VC2013/MCServer.vcproj deleted file mode 100644 index 1b710e1e4..000000000 --- a/VC2013/MCServer.vcproj +++ /dev/null @@ -1,3059 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/ToLua.vcproj b/VC2013/ToLua.vcproj deleted file mode 100644 index f174ba528..000000000 --- a/VC2013/ToLua.vcproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/expat.vcproj b/VC2013/expat.vcproj deleted file mode 100644 index a02549192..000000000 --- a/VC2013/expat.vcproj +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/VC2013/zlib.vcproj b/VC2013/zlib.vcproj deleted file mode 100644 index 1e07afc4c..000000000 --- a/VC2013/zlib.vcproj +++ /dev/null @@ -1,386 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 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 +++++++++++----------- VC2013/MCServer.vcxproj.filters | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'VC2013') 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 @@ - + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index 348c725f6..aecbcd557 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -513,10 +513,10 @@ Source Files\Bindings - + Source Files\External - + Source Files\External @@ -876,10 +876,10 @@ Source Files\Protocol - + Source Files\SQLite - + Source Files\LuaExpat @@ -1474,10 +1474,10 @@ Source Files\Bindings - + Source Files\External - + Source Files\External @@ -1594,13 +1594,13 @@ Source Files\Protocol - + Source Files\SQLite - + Source Files\SQLite - + Source Files\LuaExpat @@ -1659,7 +1659,7 @@ Source Files\Bindings - + Source Files\SQLite -- 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/CryptoPP.vcxproj | 4 ++++ VC2013/CryptoPP.vcxproj.filters | 12 ++++++++++++ VC2013/Lua.vcxproj | 4 ++-- VC2013/MCServer.vcxproj | 4 ++-- 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'VC2013') diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj index 7355ab64b..4a7898e4a 100644 --- a/VC2013/CryptoPP.vcxproj +++ b/VC2013/CryptoPP.vcxproj @@ -814,6 +814,7 @@ + @@ -824,6 +825,7 @@ + @@ -866,6 +868,7 @@ + @@ -888,6 +891,7 @@ + diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index f066c5ef4..e8bea416f 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -580,6 +580,18 @@ Header Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj index d4395b2d2..24f58f28c 100644 --- a/VC2013/Lua.vcxproj +++ b/VC2013/Lua.vcxproj @@ -1,4 +1,4 @@ - + @@ -138,7 +138,7 @@ - + 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') 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/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 +++---- 7 files changed, 67 insertions(+), 57 deletions(-) (limited to 'VC2013') 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 @@ - @@ -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 -- cgit v1.2.3