diff --git a/GNUmakefile b/GNUmakefile index d8afc0525..8c452c1cc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -50,6 +50,7 @@ ifeq ($(release),1) CC_OPTIONS = -g -O3 -DNDEBUG CXX_OPTIONS = -g -O3 -DNDEBUG LNK_OPTIONS = -pthread -O3 + BUILDDIR = build/release/ else @@ -61,32 +62,22 @@ ifeq ($(profile),1) CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG LNK_OPTIONS = -pthread -ggdb -O3 -pg + BUILDDIR = build/profile/ -else -ifeq ($(pedantic),1) -################ -# pedantic build - basically a debug build with lots of warnings -################ - -CC_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long -CXX_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long -LNK_OPTIONS = -pthread -ggdb -BUILDDIR = build/pedantic/ - else ################ # debug build - fully traceable by gdb in C++ code, slowest -# Since C code is used only for supporting libraries (zlib, lua), it is still O3-optimized +# Since C code is used only for supporting libraries (zlib, lua), it is still Ofast-optimized ################ -CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3 -CXX_OPTIONS = -s -ggdb -g -D_DEBUG -LNK_OPTIONS = -pthread -g -ggdb + CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3 + +CXX_OPTIONS = -s -ggdb -g -D_DEBUG -Og +LNK_OPTIONS = -pthread -g -ggdb -Og BUILDDIR = build/debug/ endif endif -endif ################################################## # Always be warning. @@ -100,6 +91,7 @@ ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0) CC_OPTIONS += -Wno-tautological-compare CXX_OPTIONS += -Wno-tautological-compare disableasm = 1 +disableofast = 1 endif @@ -150,18 +142,9 @@ endif # INCLUDE directories for MCServer INCLUDE = -I.\ - -Isource\ - -Isource/md5\ - -Isource/items\ - -Isource/blocks\ - -Itolua++-1.0.93/src/lib\ - -Ilua-5.1.4/src\ - -Izlib-1.2.7\ - -IiniFile\ - -Itolua++-1.0.93/include\ - -Ijsoncpp-src-0.5.0/include\ - -Ijsoncpp-src-0.5.0/src/lib_json\ - -Iexpat + -Isrc\ + -Ilib\ + -Ilib/jsoncpp/include @@ -170,7 +153,7 @@ INCLUDE = -I.\ ################################################### # Build MCServer -SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile expat '(' -name '*.cpp' -o -name '*.c' ')') +SOURCES := $(shell find src lib '(' -name '*.cpp' -o -name '*.c' ')') SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES)) OBJECTS := $(patsubst %.c,$(BUILDDIR)%.o,$(SOURCES)) OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS)) diff --git a/VC2008/CryptoPP.cbp b/VC2008/CryptoPP.cbp index f9f10e7a7..55b322b92 100644 --- a/VC2008/CryptoPP.cbp +++ b/VC2008/CryptoPP.cbp @@ -106,202 +106,202 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj index 6c56d3cce..530467eeb 100644 --- a/VC2008/CryptoPP.vcproj +++ b/VC2008/CryptoPP.vcproj @@ -439,7 +439,7 @@ Filter=".cpp" > @@ -5079,19 +5079,19 @@ Name="Miscellaneous" > diff --git a/VC2008/GenerateBindings.cmd b/VC2008/GenerateBindings.cmd index ac470234f..1ee0f3bf0 100644 --- a/VC2008/GenerateBindings.cmd +++ b/VC2008/GenerateBindings.cmd @@ -1,3 +1,3 @@ set ALLTOLUA_WAIT=N -cd ..\source +cd ..\src AllToLua.bat \ No newline at end of file diff --git a/VC2008/JsonCpp.cbp b/VC2008/JsonCpp.cbp index 35aa6ea81..f4826b2f1 100644 --- a/VC2008/JsonCpp.cbp +++ b/VC2008/JsonCpp.cbp @@ -20,10 +20,10 @@ - + - + @@ -39,10 +39,10 @@ - + - + @@ -58,20 +58,20 @@ - + - + - - - - - - - + + + + + + + diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj index 5fa1ec685..8b35f170b 100644 --- a/VC2008/JsonCpp.vcproj +++ b/VC2008/JsonCpp.vcproj @@ -276,31 +276,31 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/VC2008/Lua.cbp b/VC2008/Lua.cbp index 208bf42f4..33353656a 100644 --- a/VC2008/Lua.cbp +++ b/VC2008/Lua.cbp @@ -56,123 +56,123 @@ - + - - + + - - + + - + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - - - + + + - + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - - + + + - - + + - - + + - - + + diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj index cb063c53e..326ba6411 100644 --- a/VC2008/Lua.vcproj +++ b/VC2008/Lua.vcproj @@ -272,224 +272,224 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/VC2008/MCServer.cbp b/VC2008/MCServer.cbp index c44a1a445..0d63e9291 100644 --- a/VC2008/MCServer.cbp +++ b/VC2008/MCServer.cbp @@ -23,9 +23,6 @@ - - - @@ -34,9 +31,6 @@ - - - @@ -60,26 +54,20 @@ - - - - - - - + + + + - + - - - - - - - + + + + - + @@ -100,26 +88,20 @@ - - - - - - - + + + + - + - - - - - - - + + + + - + @@ -130,7 +112,7 @@ - + @@ -1715,7 +1719,7 @@ @@ -1726,7 +1730,7 @@ @@ -1736,7 +1740,7 @@ > @@ -1848,15 +1852,15 @@ Name="External" > @@ -1904,43 +1908,43 @@ Name="WorldStorage" > @@ -1948,123 +1952,123 @@ Name="Generating" > @@ -2072,283 +2076,283 @@ Name="Blocks" > @@ -2356,123 +2360,123 @@ Name="Items" > @@ -2480,71 +2484,71 @@ Name="Protocol" > @@ -2552,7 +2556,7 @@ Name="SQLite" > @@ -2636,7 +2640,7 @@ Name="LuaExpat" > @@ -2680,87 +2684,87 @@ Name="BlockEntities" > @@ -2768,59 +2772,59 @@ Name="HTTPServer" > diff --git a/VC2008/ToLua.cbp b/VC2008/ToLua.cbp index f22bfda4a..c7f24afcc 100644 --- a/VC2008/ToLua.cbp +++ b/VC2008/ToLua.cbp @@ -21,12 +21,12 @@ - - + + - - + + @@ -43,12 +43,12 @@ - - + + - - + + @@ -65,32 +65,32 @@ - - + + - - + + - + - + - - + + - + - + - + diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj index dd5cfb217..24a5d8b4f 100644 --- a/VC2008/ToLua.vcproj +++ b/VC2008/ToLua.vcproj @@ -41,7 +41,7 @@ diff --git a/VC2008/expat.cbp b/VC2008/expat.cbp index 6cd3f6234..6c89eff8d 100644 --- a/VC2008/expat.cbp +++ b/VC2008/expat.cbp @@ -40,32 +40,32 @@ - - - - - - - - - - - + + + + + + + + + + + - + - - + + - - + + - - + + diff --git a/VC2008/expat.vcproj b/VC2008/expat.vcproj index 148fd0cad..a02549192 100644 --- a/VC2008/expat.vcproj +++ b/VC2008/expat.vcproj @@ -149,75 +149,75 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/VC2008/zlib.cbp b/VC2008/zlib.cbp index 2b7d759da..1d24c24ce 100644 --- a/VC2008/zlib.cbp +++ b/VC2008/zlib.cbp @@ -56,62 +56,62 @@ - + - + - + - - + + - - + + - - + + - + - + - + - + - - - + + + - - + + - - + + - - + + - - - + + + - + diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj index 6858b5610..1e07afc4c 100644 --- a/VC2008/zlib.vcproj +++ b/VC2008/zlib.vcproj @@ -276,107 +276,107 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > 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.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..793db552c 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,598 +2,598 @@ - {66d19353-af6a-4f52-9546-f52f44dd13cc} + {21031ece-70f0-4aa6-9069-6947175663ea} .cpp - {512ceb0e-67f5-47b1-b19b-59352a5e0785} + {20dd9259-32b4-4f5b-9af8-c689a12627ec} .;.h - {b7c7d4fa-281f-482d-be38-d8106878975c} + {9a225122-4fcd-43c9-868a-6caf0dd272ce} - + 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.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.vcxproj b/VC2013/Lua.vcxproj index 453ccb984..2488aa6aa 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..21cc86850 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.vcxproj b/VC2013/MCServer.vcxproj index cd9f6eb4f..ecb568e9a 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -64,7 +64,7 @@ <_ProjectFileVersion>12.0.21005.1 - ..\MCServer\ + Debug\ Debug\ true @@ -83,9 +83,9 @@ - /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) + ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks @@ -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 @@ -113,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 @@ -139,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 @@ -163,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 @@ -189,293 +186,293 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true true true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -491,26 +488,26 @@ true true - + 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) @@ -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,26 +837,27 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index c37f00958..1f213b900 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} + {0c1dd2bf-04b0-4605-b963-b187e900b4a1} - {0e9000fa-a1b6-4899-b0fb-66d8daa8c0e5} + {5c101216-8e22-4ad4-a27d-1572a4d95947} - {a9d61705-26a1-4f89-ab9c-d73286417d25} + {eb7a158f-f532-4db5-9314-fca01f04a38e} - {6f57d9e4-3758-4a17-a3a4-fd8ee5f9e398} + {c378fbaa-2232-4123-a58d-84f2e2e32376} - {b58a4bc8-5be3-438d-8c21-bc56db2e66d2} + {be34fc66-075c-45f0-a292-e4ace73a5726} - {6f4125b6-47ff-4de0-8294-839dab538b65} + {8dcfacbc-454b-4530-af61-d9db5aebb5bd} - {6fe6ae96-c1aa-4968-b4ef-9d6f8c3f2888} + {3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15} - {30704df7-b1ff-4bfc-aedf-afe4afcada3f} + {50cbaa98-dc12-4cc9-9ba6-4e08e885c924} - {0a54250c-fdb6-4b65-9102-20cd793a9b78} + {889b7953-c303-448a-8cf9-ca624011d131} - {bea06b59-4fed-4e7f-ac87-2e9c0a1b6d27} + {9313323e-633a-4c87-812c-0dda81b2a509} - {a5a43ccd-e85d-4723-9c8a-3f83c730f597} + {61f1ea93-c0b0-4296-81fa-808116542dc8} - {b5f65bf0-470c-4c3c-9777-a7f3b79b8166} + {61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6} - {95e9878e-81c3-4b84-aa1c-d464d2a95883} + {86f6a355-fd04-4ba5-82b0-0fb57897da8d} - {a67840b7-95ac-447f-9f23-d779aeaf5f49} + {dacfe6a2-94db-4257-8727-0f9a8c70fc8f} - {bee4489c-556e-4eff-876e-b46b16eb33dc} + {b41f78d8-61f8-4476-86cf-d08080418dcb} - {28f497b8-c75d-44e6-8e0c-8617cb56eb37} + {78f41ac0-8ed5-4951-8373-2aed18d9c741} - {a9725758-b517-4602-a8e1-ffb950215db8} + {fc1463dd-e130-49cb-96cf-ee6755cf2de1} - {ab501743-5b5d-449e-8ed7-bc823368a58c} + {a50ba11b-40c8-43ff-aa5b-aac2e4285df0} - {baf72963-ce16-452e-80b2-a653fe04b25a} + {37df6f7f-93ff-4c4a-89cf-77bb6feb215f} - {05040adb-d357-4712-b326-d8cad05f6e40} + {3d8e534e-8cd7-4dc5-9626-a1ce9559c118} - {f2962218-2274-4d13-bd40-ff09c634ae1f} + {4419315f-3ef3-490d-ba0a-df22565b9a02} - {ad918b66-c94a-4c54-ad79-6733424e8083} + {3491f495-c715-4a5b-845e-1638a4ef0127} - {7f151cf3-a835-4e77-9c43-0a3d4bd02714} + {4bb6b059-2004-4795-a0e7-d401affb3063} @@ -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.vcxproj b/VC2013/ToLua.vcxproj index cd032d3b3..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 @@ -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.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.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 diff --git a/CryptoPP/Doxyfile b/lib/cryptopp/Doxyfile similarity index 100% rename from CryptoPP/Doxyfile rename to lib/cryptopp/Doxyfile diff --git a/CryptoPP/License.txt b/lib/cryptopp/License.txt similarity index 100% rename from CryptoPP/License.txt rename to lib/cryptopp/License.txt diff --git a/CryptoPP/Readme.txt b/lib/cryptopp/Readme.txt similarity index 100% rename from CryptoPP/Readme.txt rename to lib/cryptopp/Readme.txt diff --git a/CryptoPP/adler32.cpp b/lib/cryptopp/adler32.cpp similarity index 100% rename from CryptoPP/adler32.cpp rename to lib/cryptopp/adler32.cpp diff --git a/CryptoPP/adler32.h b/lib/cryptopp/adler32.h similarity index 100% rename from CryptoPP/adler32.h rename to lib/cryptopp/adler32.h diff --git a/CryptoPP/aes.h b/lib/cryptopp/aes.h similarity index 100% rename from CryptoPP/aes.h rename to lib/cryptopp/aes.h diff --git a/CryptoPP/algebra.cpp b/lib/cryptopp/algebra.cpp similarity index 100% rename from CryptoPP/algebra.cpp rename to lib/cryptopp/algebra.cpp diff --git a/CryptoPP/algebra.h b/lib/cryptopp/algebra.h similarity index 100% rename from CryptoPP/algebra.h rename to lib/cryptopp/algebra.h diff --git a/CryptoPP/algparam.cpp b/lib/cryptopp/algparam.cpp similarity index 100% rename from CryptoPP/algparam.cpp rename to lib/cryptopp/algparam.cpp diff --git a/CryptoPP/algparam.h b/lib/cryptopp/algparam.h similarity index 100% rename from CryptoPP/algparam.h rename to lib/cryptopp/algparam.h diff --git a/CryptoPP/argnames.h b/lib/cryptopp/argnames.h similarity index 100% rename from CryptoPP/argnames.h rename to lib/cryptopp/argnames.h diff --git a/CryptoPP/asn.cpp b/lib/cryptopp/asn.cpp similarity index 100% rename from CryptoPP/asn.cpp rename to lib/cryptopp/asn.cpp diff --git a/CryptoPP/asn.h b/lib/cryptopp/asn.h similarity index 100% rename from CryptoPP/asn.h rename to lib/cryptopp/asn.h diff --git a/CryptoPP/authenc.cpp b/lib/cryptopp/authenc.cpp similarity index 100% rename from CryptoPP/authenc.cpp rename to lib/cryptopp/authenc.cpp diff --git a/CryptoPP/authenc.h b/lib/cryptopp/authenc.h similarity index 100% rename from CryptoPP/authenc.h rename to lib/cryptopp/authenc.h diff --git a/CryptoPP/base32.cpp b/lib/cryptopp/base32.cpp similarity index 100% rename from CryptoPP/base32.cpp rename to lib/cryptopp/base32.cpp diff --git a/CryptoPP/base32.h b/lib/cryptopp/base32.h similarity index 100% rename from CryptoPP/base32.h rename to lib/cryptopp/base32.h diff --git a/CryptoPP/base64.cpp b/lib/cryptopp/base64.cpp similarity index 100% rename from CryptoPP/base64.cpp rename to lib/cryptopp/base64.cpp diff --git a/CryptoPP/base64.h b/lib/cryptopp/base64.h similarity index 100% rename from CryptoPP/base64.h rename to lib/cryptopp/base64.h diff --git a/CryptoPP/basecode.cpp b/lib/cryptopp/basecode.cpp similarity index 100% rename from CryptoPP/basecode.cpp rename to lib/cryptopp/basecode.cpp diff --git a/CryptoPP/basecode.h b/lib/cryptopp/basecode.h similarity index 100% rename from CryptoPP/basecode.h rename to lib/cryptopp/basecode.h diff --git a/CryptoPP/cbcmac.cpp b/lib/cryptopp/cbcmac.cpp similarity index 100% rename from CryptoPP/cbcmac.cpp rename to lib/cryptopp/cbcmac.cpp diff --git a/CryptoPP/cbcmac.h b/lib/cryptopp/cbcmac.h similarity index 100% rename from CryptoPP/cbcmac.h rename to lib/cryptopp/cbcmac.h diff --git a/CryptoPP/ccm.cpp b/lib/cryptopp/ccm.cpp similarity index 100% rename from CryptoPP/ccm.cpp rename to lib/cryptopp/ccm.cpp diff --git a/CryptoPP/ccm.h b/lib/cryptopp/ccm.h similarity index 100% rename from CryptoPP/ccm.h rename to lib/cryptopp/ccm.h diff --git a/CryptoPP/channels.cpp b/lib/cryptopp/channels.cpp similarity index 100% rename from CryptoPP/channels.cpp rename to lib/cryptopp/channels.cpp diff --git a/CryptoPP/channels.h b/lib/cryptopp/channels.h similarity index 100% rename from CryptoPP/channels.h rename to lib/cryptopp/channels.h diff --git a/CryptoPP/cmac.cpp b/lib/cryptopp/cmac.cpp similarity index 100% rename from CryptoPP/cmac.cpp rename to lib/cryptopp/cmac.cpp diff --git a/CryptoPP/cmac.h b/lib/cryptopp/cmac.h similarity index 100% rename from CryptoPP/cmac.h rename to lib/cryptopp/cmac.h diff --git a/CryptoPP/config.h b/lib/cryptopp/config.h similarity index 100% rename from CryptoPP/config.h rename to lib/cryptopp/config.h diff --git a/CryptoPP/cpu.cpp b/lib/cryptopp/cpu.cpp similarity index 100% rename from CryptoPP/cpu.cpp rename to lib/cryptopp/cpu.cpp diff --git a/CryptoPP/cpu.h b/lib/cryptopp/cpu.h similarity index 100% rename from CryptoPP/cpu.h rename to lib/cryptopp/cpu.h diff --git a/CryptoPP/crc.cpp b/lib/cryptopp/crc.cpp similarity index 100% rename from CryptoPP/crc.cpp rename to lib/cryptopp/crc.cpp diff --git a/CryptoPP/crc.h b/lib/cryptopp/crc.h similarity index 100% rename from CryptoPP/crc.h rename to lib/cryptopp/crc.h diff --git a/CryptoPP/cryptlib.cpp b/lib/cryptopp/cryptlib.cpp similarity index 100% rename from CryptoPP/cryptlib.cpp rename to lib/cryptopp/cryptlib.cpp diff --git a/CryptoPP/cryptlib.h b/lib/cryptopp/cryptlib.h similarity index 100% rename from CryptoPP/cryptlib.h rename to lib/cryptopp/cryptlib.h diff --git a/CryptoPP/default.cpp b/lib/cryptopp/default.cpp similarity index 100% rename from CryptoPP/default.cpp rename to lib/cryptopp/default.cpp diff --git a/CryptoPP/default.h b/lib/cryptopp/default.h similarity index 100% rename from CryptoPP/default.h rename to lib/cryptopp/default.h diff --git a/CryptoPP/des.cpp b/lib/cryptopp/des.cpp similarity index 100% rename from CryptoPP/des.cpp rename to lib/cryptopp/des.cpp diff --git a/CryptoPP/des.h b/lib/cryptopp/des.h similarity index 100% rename from CryptoPP/des.h rename to lib/cryptopp/des.h diff --git a/CryptoPP/dessp.cpp b/lib/cryptopp/dessp.cpp similarity index 100% rename from CryptoPP/dessp.cpp rename to lib/cryptopp/dessp.cpp diff --git a/CryptoPP/dh.cpp b/lib/cryptopp/dh.cpp similarity index 100% rename from CryptoPP/dh.cpp rename to lib/cryptopp/dh.cpp diff --git a/CryptoPP/dh.h b/lib/cryptopp/dh.h similarity index 100% rename from CryptoPP/dh.h rename to lib/cryptopp/dh.h diff --git a/CryptoPP/dh2.cpp b/lib/cryptopp/dh2.cpp similarity index 100% rename from CryptoPP/dh2.cpp rename to lib/cryptopp/dh2.cpp diff --git a/CryptoPP/dh2.h b/lib/cryptopp/dh2.h similarity index 100% rename from CryptoPP/dh2.h rename to lib/cryptopp/dh2.h diff --git a/CryptoPP/dll.cpp b/lib/cryptopp/dll.cpp similarity index 100% rename from CryptoPP/dll.cpp rename to lib/cryptopp/dll.cpp diff --git a/CryptoPP/dll.h b/lib/cryptopp/dll.h similarity index 100% rename from CryptoPP/dll.h rename to lib/cryptopp/dll.h diff --git a/CryptoPP/dmac.h b/lib/cryptopp/dmac.h similarity index 100% rename from CryptoPP/dmac.h rename to lib/cryptopp/dmac.h diff --git a/CryptoPP/dsa.cpp b/lib/cryptopp/dsa.cpp similarity index 100% rename from CryptoPP/dsa.cpp rename to lib/cryptopp/dsa.cpp diff --git a/CryptoPP/dsa.h b/lib/cryptopp/dsa.h similarity index 100% rename from CryptoPP/dsa.h rename to lib/cryptopp/dsa.h diff --git a/CryptoPP/eax.cpp b/lib/cryptopp/eax.cpp similarity index 100% rename from CryptoPP/eax.cpp rename to lib/cryptopp/eax.cpp diff --git a/CryptoPP/eax.h b/lib/cryptopp/eax.h similarity index 100% rename from CryptoPP/eax.h rename to lib/cryptopp/eax.h diff --git a/CryptoPP/ec2n.cpp b/lib/cryptopp/ec2n.cpp similarity index 100% rename from CryptoPP/ec2n.cpp rename to lib/cryptopp/ec2n.cpp diff --git a/CryptoPP/ec2n.h b/lib/cryptopp/ec2n.h similarity index 100% rename from CryptoPP/ec2n.h rename to lib/cryptopp/ec2n.h diff --git a/CryptoPP/eccrypto.cpp b/lib/cryptopp/eccrypto.cpp similarity index 100% rename from CryptoPP/eccrypto.cpp rename to lib/cryptopp/eccrypto.cpp diff --git a/CryptoPP/eccrypto.h b/lib/cryptopp/eccrypto.h similarity index 100% rename from CryptoPP/eccrypto.h rename to lib/cryptopp/eccrypto.h diff --git a/CryptoPP/ecp.cpp b/lib/cryptopp/ecp.cpp similarity index 100% rename from CryptoPP/ecp.cpp rename to lib/cryptopp/ecp.cpp diff --git a/CryptoPP/ecp.h b/lib/cryptopp/ecp.h similarity index 100% rename from CryptoPP/ecp.h rename to lib/cryptopp/ecp.h diff --git a/CryptoPP/elgamal.cpp b/lib/cryptopp/elgamal.cpp similarity index 100% rename from CryptoPP/elgamal.cpp rename to lib/cryptopp/elgamal.cpp diff --git a/CryptoPP/elgamal.h b/lib/cryptopp/elgamal.h similarity index 100% rename from CryptoPP/elgamal.h rename to lib/cryptopp/elgamal.h diff --git a/CryptoPP/emsa2.cpp b/lib/cryptopp/emsa2.cpp similarity index 100% rename from CryptoPP/emsa2.cpp rename to lib/cryptopp/emsa2.cpp diff --git a/CryptoPP/emsa2.h b/lib/cryptopp/emsa2.h similarity index 100% rename from CryptoPP/emsa2.h rename to lib/cryptopp/emsa2.h diff --git a/CryptoPP/eprecomp.cpp b/lib/cryptopp/eprecomp.cpp similarity index 100% rename from CryptoPP/eprecomp.cpp rename to lib/cryptopp/eprecomp.cpp diff --git a/CryptoPP/eprecomp.h b/lib/cryptopp/eprecomp.h similarity index 100% rename from CryptoPP/eprecomp.h rename to lib/cryptopp/eprecomp.h diff --git a/CryptoPP/esign.cpp b/lib/cryptopp/esign.cpp similarity index 100% rename from CryptoPP/esign.cpp rename to lib/cryptopp/esign.cpp diff --git a/CryptoPP/esign.h b/lib/cryptopp/esign.h similarity index 100% rename from CryptoPP/esign.h rename to lib/cryptopp/esign.h diff --git a/CryptoPP/factory.h b/lib/cryptopp/factory.h similarity index 100% rename from CryptoPP/factory.h rename to lib/cryptopp/factory.h diff --git a/CryptoPP/files.cpp b/lib/cryptopp/files.cpp similarity index 100% rename from CryptoPP/files.cpp rename to lib/cryptopp/files.cpp diff --git a/CryptoPP/files.h b/lib/cryptopp/files.h similarity index 100% rename from CryptoPP/files.h rename to lib/cryptopp/files.h diff --git a/CryptoPP/filters.cpp b/lib/cryptopp/filters.cpp similarity index 100% rename from CryptoPP/filters.cpp rename to lib/cryptopp/filters.cpp diff --git a/CryptoPP/filters.h b/lib/cryptopp/filters.h similarity index 100% rename from CryptoPP/filters.h rename to lib/cryptopp/filters.h diff --git a/CryptoPP/fips140.cpp b/lib/cryptopp/fips140.cpp similarity index 100% rename from CryptoPP/fips140.cpp rename to lib/cryptopp/fips140.cpp diff --git a/CryptoPP/fips140.h b/lib/cryptopp/fips140.h similarity index 100% rename from CryptoPP/fips140.h rename to lib/cryptopp/fips140.h diff --git a/CryptoPP/fltrimpl.h b/lib/cryptopp/fltrimpl.h similarity index 100% rename from CryptoPP/fltrimpl.h rename to lib/cryptopp/fltrimpl.h diff --git a/CryptoPP/gcm.cpp b/lib/cryptopp/gcm.cpp similarity index 100% rename from CryptoPP/gcm.cpp rename to lib/cryptopp/gcm.cpp diff --git a/CryptoPP/gcm.h b/lib/cryptopp/gcm.h similarity index 100% rename from CryptoPP/gcm.h rename to lib/cryptopp/gcm.h diff --git a/CryptoPP/gf256.cpp b/lib/cryptopp/gf256.cpp similarity index 100% rename from CryptoPP/gf256.cpp rename to lib/cryptopp/gf256.cpp diff --git a/CryptoPP/gf256.h b/lib/cryptopp/gf256.h similarity index 100% rename from CryptoPP/gf256.h rename to lib/cryptopp/gf256.h diff --git a/CryptoPP/gf2_32.cpp b/lib/cryptopp/gf2_32.cpp similarity index 100% rename from CryptoPP/gf2_32.cpp rename to lib/cryptopp/gf2_32.cpp diff --git a/CryptoPP/gf2_32.h b/lib/cryptopp/gf2_32.h similarity index 100% rename from CryptoPP/gf2_32.h rename to lib/cryptopp/gf2_32.h diff --git a/CryptoPP/gf2n.cpp b/lib/cryptopp/gf2n.cpp similarity index 100% rename from CryptoPP/gf2n.cpp rename to lib/cryptopp/gf2n.cpp diff --git a/CryptoPP/gf2n.h b/lib/cryptopp/gf2n.h similarity index 100% rename from CryptoPP/gf2n.h rename to lib/cryptopp/gf2n.h diff --git a/CryptoPP/gfpcrypt.cpp b/lib/cryptopp/gfpcrypt.cpp similarity index 100% rename from CryptoPP/gfpcrypt.cpp rename to lib/cryptopp/gfpcrypt.cpp diff --git a/CryptoPP/gfpcrypt.h b/lib/cryptopp/gfpcrypt.h similarity index 100% rename from CryptoPP/gfpcrypt.h rename to lib/cryptopp/gfpcrypt.h diff --git a/CryptoPP/gzip.h b/lib/cryptopp/gzip.h similarity index 100% rename from CryptoPP/gzip.h rename to lib/cryptopp/gzip.h diff --git a/CryptoPP/hex.cpp b/lib/cryptopp/hex.cpp similarity index 100% rename from CryptoPP/hex.cpp rename to lib/cryptopp/hex.cpp diff --git a/CryptoPP/hex.h b/lib/cryptopp/hex.h similarity index 100% rename from CryptoPP/hex.h rename to lib/cryptopp/hex.h diff --git a/CryptoPP/hmac.cpp b/lib/cryptopp/hmac.cpp similarity index 100% rename from CryptoPP/hmac.cpp rename to lib/cryptopp/hmac.cpp diff --git a/CryptoPP/hmac.h b/lib/cryptopp/hmac.h similarity index 100% rename from CryptoPP/hmac.h rename to lib/cryptopp/hmac.h diff --git a/CryptoPP/hrtimer.cpp b/lib/cryptopp/hrtimer.cpp similarity index 100% rename from CryptoPP/hrtimer.cpp rename to lib/cryptopp/hrtimer.cpp diff --git a/CryptoPP/hrtimer.h b/lib/cryptopp/hrtimer.h similarity index 100% rename from CryptoPP/hrtimer.h rename to lib/cryptopp/hrtimer.h diff --git a/CryptoPP/integer.cpp b/lib/cryptopp/integer.cpp similarity index 100% rename from CryptoPP/integer.cpp rename to lib/cryptopp/integer.cpp diff --git a/CryptoPP/integer.h b/lib/cryptopp/integer.h similarity index 100% rename from CryptoPP/integer.h rename to lib/cryptopp/integer.h diff --git a/CryptoPP/iterhash.cpp b/lib/cryptopp/iterhash.cpp similarity index 100% rename from CryptoPP/iterhash.cpp rename to lib/cryptopp/iterhash.cpp diff --git a/CryptoPP/iterhash.h b/lib/cryptopp/iterhash.h similarity index 100% rename from CryptoPP/iterhash.h rename to lib/cryptopp/iterhash.h diff --git a/CryptoPP/lubyrack.h b/lib/cryptopp/lubyrack.h similarity index 100% rename from CryptoPP/lubyrack.h rename to lib/cryptopp/lubyrack.h diff --git a/CryptoPP/luc.cpp b/lib/cryptopp/luc.cpp similarity index 100% rename from CryptoPP/luc.cpp rename to lib/cryptopp/luc.cpp diff --git a/CryptoPP/luc.h b/lib/cryptopp/luc.h similarity index 100% rename from CryptoPP/luc.h rename to lib/cryptopp/luc.h diff --git a/CryptoPP/md2.cpp b/lib/cryptopp/md2.cpp similarity index 100% rename from CryptoPP/md2.cpp rename to lib/cryptopp/md2.cpp diff --git a/CryptoPP/md2.h b/lib/cryptopp/md2.h similarity index 100% rename from CryptoPP/md2.h rename to lib/cryptopp/md2.h diff --git a/CryptoPP/md4.cpp b/lib/cryptopp/md4.cpp similarity index 100% rename from CryptoPP/md4.cpp rename to lib/cryptopp/md4.cpp diff --git a/CryptoPP/md4.h b/lib/cryptopp/md4.h similarity index 100% rename from CryptoPP/md4.h rename to lib/cryptopp/md4.h diff --git a/CryptoPP/md5.cpp b/lib/cryptopp/md5.cpp similarity index 100% rename from CryptoPP/md5.cpp rename to lib/cryptopp/md5.cpp diff --git a/CryptoPP/md5.h b/lib/cryptopp/md5.h similarity index 100% rename from CryptoPP/md5.h rename to lib/cryptopp/md5.h diff --git a/CryptoPP/mdc.h b/lib/cryptopp/mdc.h similarity index 100% rename from CryptoPP/mdc.h rename to lib/cryptopp/mdc.h diff --git a/CryptoPP/misc.cpp b/lib/cryptopp/misc.cpp similarity index 100% rename from CryptoPP/misc.cpp rename to lib/cryptopp/misc.cpp diff --git a/CryptoPP/misc.h b/lib/cryptopp/misc.h similarity index 100% rename from CryptoPP/misc.h rename to lib/cryptopp/misc.h diff --git a/CryptoPP/modarith.h b/lib/cryptopp/modarith.h similarity index 100% rename from CryptoPP/modarith.h rename to lib/cryptopp/modarith.h diff --git a/CryptoPP/modes.cpp b/lib/cryptopp/modes.cpp similarity index 100% rename from CryptoPP/modes.cpp rename to lib/cryptopp/modes.cpp diff --git a/CryptoPP/modes.h b/lib/cryptopp/modes.h similarity index 100% rename from CryptoPP/modes.h rename to lib/cryptopp/modes.h diff --git a/CryptoPP/modexppc.h b/lib/cryptopp/modexppc.h similarity index 100% rename from CryptoPP/modexppc.h rename to lib/cryptopp/modexppc.h diff --git a/CryptoPP/mqueue.cpp b/lib/cryptopp/mqueue.cpp similarity index 100% rename from CryptoPP/mqueue.cpp rename to lib/cryptopp/mqueue.cpp diff --git a/CryptoPP/mqueue.h b/lib/cryptopp/mqueue.h similarity index 100% rename from CryptoPP/mqueue.h rename to lib/cryptopp/mqueue.h diff --git a/CryptoPP/mqv.cpp b/lib/cryptopp/mqv.cpp similarity index 100% rename from CryptoPP/mqv.cpp rename to lib/cryptopp/mqv.cpp diff --git a/CryptoPP/mqv.h b/lib/cryptopp/mqv.h similarity index 100% rename from CryptoPP/mqv.h rename to lib/cryptopp/mqv.h diff --git a/CryptoPP/nbtheory.cpp b/lib/cryptopp/nbtheory.cpp similarity index 100% rename from CryptoPP/nbtheory.cpp rename to lib/cryptopp/nbtheory.cpp diff --git a/CryptoPP/nbtheory.h b/lib/cryptopp/nbtheory.h similarity index 100% rename from CryptoPP/nbtheory.h rename to lib/cryptopp/nbtheory.h diff --git a/CryptoPP/network.cpp b/lib/cryptopp/network.cpp similarity index 100% rename from CryptoPP/network.cpp rename to lib/cryptopp/network.cpp diff --git a/CryptoPP/network.h b/lib/cryptopp/network.h similarity index 100% rename from CryptoPP/network.h rename to lib/cryptopp/network.h diff --git a/CryptoPP/nr.h b/lib/cryptopp/nr.h similarity index 100% rename from CryptoPP/nr.h rename to lib/cryptopp/nr.h diff --git a/CryptoPP/oaep.cpp b/lib/cryptopp/oaep.cpp similarity index 100% rename from CryptoPP/oaep.cpp rename to lib/cryptopp/oaep.cpp diff --git a/CryptoPP/oaep.h b/lib/cryptopp/oaep.h similarity index 100% rename from CryptoPP/oaep.h rename to lib/cryptopp/oaep.h diff --git a/CryptoPP/oids.h b/lib/cryptopp/oids.h similarity index 100% rename from CryptoPP/oids.h rename to lib/cryptopp/oids.h diff --git a/CryptoPP/osrng.cpp b/lib/cryptopp/osrng.cpp similarity index 100% rename from CryptoPP/osrng.cpp rename to lib/cryptopp/osrng.cpp diff --git a/CryptoPP/osrng.h b/lib/cryptopp/osrng.h similarity index 100% rename from CryptoPP/osrng.h rename to lib/cryptopp/osrng.h diff --git a/CryptoPP/pch.cpp b/lib/cryptopp/pch.cpp similarity index 100% rename from CryptoPP/pch.cpp rename to lib/cryptopp/pch.cpp diff --git a/CryptoPP/pch.h b/lib/cryptopp/pch.h similarity index 100% rename from CryptoPP/pch.h rename to lib/cryptopp/pch.h diff --git a/CryptoPP/pkcspad.cpp b/lib/cryptopp/pkcspad.cpp similarity index 100% rename from CryptoPP/pkcspad.cpp rename to lib/cryptopp/pkcspad.cpp diff --git a/CryptoPP/pkcspad.h b/lib/cryptopp/pkcspad.h similarity index 100% rename from CryptoPP/pkcspad.h rename to lib/cryptopp/pkcspad.h diff --git a/CryptoPP/polynomi.cpp b/lib/cryptopp/polynomi.cpp similarity index 100% rename from CryptoPP/polynomi.cpp rename to lib/cryptopp/polynomi.cpp diff --git a/CryptoPP/polynomi.h b/lib/cryptopp/polynomi.h similarity index 100% rename from CryptoPP/polynomi.h rename to lib/cryptopp/polynomi.h diff --git a/CryptoPP/pssr.cpp b/lib/cryptopp/pssr.cpp similarity index 100% rename from CryptoPP/pssr.cpp rename to lib/cryptopp/pssr.cpp diff --git a/CryptoPP/pssr.h b/lib/cryptopp/pssr.h similarity index 100% rename from CryptoPP/pssr.h rename to lib/cryptopp/pssr.h diff --git a/CryptoPP/pubkey.cpp b/lib/cryptopp/pubkey.cpp similarity index 100% rename from CryptoPP/pubkey.cpp rename to lib/cryptopp/pubkey.cpp diff --git a/CryptoPP/pubkey.h b/lib/cryptopp/pubkey.h similarity index 100% rename from CryptoPP/pubkey.h rename to lib/cryptopp/pubkey.h diff --git a/CryptoPP/pwdbased.h b/lib/cryptopp/pwdbased.h similarity index 100% rename from CryptoPP/pwdbased.h rename to lib/cryptopp/pwdbased.h diff --git a/CryptoPP/queue.cpp b/lib/cryptopp/queue.cpp similarity index 100% rename from CryptoPP/queue.cpp rename to lib/cryptopp/queue.cpp diff --git a/CryptoPP/queue.h b/lib/cryptopp/queue.h similarity index 100% rename from CryptoPP/queue.h rename to lib/cryptopp/queue.h diff --git a/CryptoPP/rabin.cpp b/lib/cryptopp/rabin.cpp similarity index 100% rename from CryptoPP/rabin.cpp rename to lib/cryptopp/rabin.cpp diff --git a/CryptoPP/rabin.h b/lib/cryptopp/rabin.h similarity index 100% rename from CryptoPP/rabin.h rename to lib/cryptopp/rabin.h diff --git a/CryptoPP/randpool.cpp b/lib/cryptopp/randpool.cpp similarity index 100% rename from CryptoPP/randpool.cpp rename to lib/cryptopp/randpool.cpp diff --git a/CryptoPP/randpool.h b/lib/cryptopp/randpool.h similarity index 100% rename from CryptoPP/randpool.h rename to lib/cryptopp/randpool.h diff --git a/CryptoPP/rdtables.cpp b/lib/cryptopp/rdtables.cpp similarity index 100% rename from CryptoPP/rdtables.cpp rename to lib/cryptopp/rdtables.cpp diff --git a/CryptoPP/resource.h b/lib/cryptopp/resource.h similarity index 100% rename from CryptoPP/resource.h rename to lib/cryptopp/resource.h diff --git a/CryptoPP/rijndael.cpp b/lib/cryptopp/rijndael.cpp similarity index 100% rename from CryptoPP/rijndael.cpp rename to lib/cryptopp/rijndael.cpp diff --git a/CryptoPP/rijndael.h b/lib/cryptopp/rijndael.h similarity index 100% rename from CryptoPP/rijndael.h rename to lib/cryptopp/rijndael.h diff --git a/CryptoPP/rng.cpp b/lib/cryptopp/rng.cpp similarity index 100% rename from CryptoPP/rng.cpp rename to lib/cryptopp/rng.cpp diff --git a/CryptoPP/rng.h b/lib/cryptopp/rng.h similarity index 100% rename from CryptoPP/rng.h rename to lib/cryptopp/rng.h diff --git a/CryptoPP/rsa.cpp b/lib/cryptopp/rsa.cpp similarity index 100% rename from CryptoPP/rsa.cpp rename to lib/cryptopp/rsa.cpp diff --git a/CryptoPP/rsa.h b/lib/cryptopp/rsa.h similarity index 100% rename from CryptoPP/rsa.h rename to lib/cryptopp/rsa.h diff --git a/CryptoPP/rw.cpp b/lib/cryptopp/rw.cpp similarity index 100% rename from CryptoPP/rw.cpp rename to lib/cryptopp/rw.cpp diff --git a/CryptoPP/rw.h b/lib/cryptopp/rw.h similarity index 100% rename from CryptoPP/rw.h rename to lib/cryptopp/rw.h diff --git a/CryptoPP/safer.cpp b/lib/cryptopp/safer.cpp similarity index 100% rename from CryptoPP/safer.cpp rename to lib/cryptopp/safer.cpp diff --git a/CryptoPP/safer.h b/lib/cryptopp/safer.h similarity index 100% rename from CryptoPP/safer.h rename to lib/cryptopp/safer.h diff --git a/CryptoPP/seal.cpp b/lib/cryptopp/seal.cpp similarity index 100% rename from CryptoPP/seal.cpp rename to lib/cryptopp/seal.cpp diff --git a/CryptoPP/seal.h b/lib/cryptopp/seal.h similarity index 100% rename from CryptoPP/seal.h rename to lib/cryptopp/seal.h diff --git a/CryptoPP/secblock.h b/lib/cryptopp/secblock.h similarity index 100% rename from CryptoPP/secblock.h rename to lib/cryptopp/secblock.h diff --git a/CryptoPP/seckey.h b/lib/cryptopp/seckey.h similarity index 100% rename from CryptoPP/seckey.h rename to lib/cryptopp/seckey.h diff --git a/CryptoPP/seed.cpp b/lib/cryptopp/seed.cpp similarity index 100% rename from CryptoPP/seed.cpp rename to lib/cryptopp/seed.cpp diff --git a/CryptoPP/seed.h b/lib/cryptopp/seed.h similarity index 100% rename from CryptoPP/seed.h rename to lib/cryptopp/seed.h diff --git a/CryptoPP/sha.cpp b/lib/cryptopp/sha.cpp similarity index 100% rename from CryptoPP/sha.cpp rename to lib/cryptopp/sha.cpp diff --git a/CryptoPP/sha.h b/lib/cryptopp/sha.h similarity index 100% rename from CryptoPP/sha.h rename to lib/cryptopp/sha.h diff --git a/CryptoPP/shacal2.cpp b/lib/cryptopp/shacal2.cpp similarity index 100% rename from CryptoPP/shacal2.cpp rename to lib/cryptopp/shacal2.cpp diff --git a/CryptoPP/shacal2.h b/lib/cryptopp/shacal2.h similarity index 100% rename from CryptoPP/shacal2.h rename to lib/cryptopp/shacal2.h diff --git a/CryptoPP/simple.cpp b/lib/cryptopp/simple.cpp similarity index 100% rename from CryptoPP/simple.cpp rename to lib/cryptopp/simple.cpp diff --git a/CryptoPP/simple.h b/lib/cryptopp/simple.h similarity index 100% rename from CryptoPP/simple.h rename to lib/cryptopp/simple.h diff --git a/CryptoPP/smartptr.h b/lib/cryptopp/smartptr.h similarity index 100% rename from CryptoPP/smartptr.h rename to lib/cryptopp/smartptr.h diff --git a/CryptoPP/socketft.cpp b/lib/cryptopp/socketft.cpp similarity index 100% rename from CryptoPP/socketft.cpp rename to lib/cryptopp/socketft.cpp diff --git a/CryptoPP/socketft.h b/lib/cryptopp/socketft.h similarity index 100% rename from CryptoPP/socketft.h rename to lib/cryptopp/socketft.h diff --git a/CryptoPP/square.cpp b/lib/cryptopp/square.cpp similarity index 100% rename from CryptoPP/square.cpp rename to lib/cryptopp/square.cpp diff --git a/CryptoPP/square.h b/lib/cryptopp/square.h similarity index 100% rename from CryptoPP/square.h rename to lib/cryptopp/square.h diff --git a/CryptoPP/squaretb.cpp b/lib/cryptopp/squaretb.cpp similarity index 100% rename from CryptoPP/squaretb.cpp rename to lib/cryptopp/squaretb.cpp diff --git a/CryptoPP/stdcpp.h b/lib/cryptopp/stdcpp.h similarity index 100% rename from CryptoPP/stdcpp.h rename to lib/cryptopp/stdcpp.h diff --git a/CryptoPP/strciphr.cpp b/lib/cryptopp/strciphr.cpp similarity index 100% rename from CryptoPP/strciphr.cpp rename to lib/cryptopp/strciphr.cpp diff --git a/CryptoPP/strciphr.h b/lib/cryptopp/strciphr.h similarity index 100% rename from CryptoPP/strciphr.h rename to lib/cryptopp/strciphr.h diff --git a/CryptoPP/tea.cpp b/lib/cryptopp/tea.cpp similarity index 100% rename from CryptoPP/tea.cpp rename to lib/cryptopp/tea.cpp diff --git a/CryptoPP/tea.h b/lib/cryptopp/tea.h similarity index 100% rename from CryptoPP/tea.h rename to lib/cryptopp/tea.h diff --git a/CryptoPP/tiger.cpp b/lib/cryptopp/tiger.cpp similarity index 100% rename from CryptoPP/tiger.cpp rename to lib/cryptopp/tiger.cpp diff --git a/CryptoPP/tiger.h b/lib/cryptopp/tiger.h similarity index 100% rename from CryptoPP/tiger.h rename to lib/cryptopp/tiger.h diff --git a/CryptoPP/tigertab.cpp b/lib/cryptopp/tigertab.cpp similarity index 100% rename from CryptoPP/tigertab.cpp rename to lib/cryptopp/tigertab.cpp diff --git a/CryptoPP/trdlocal.cpp b/lib/cryptopp/trdlocal.cpp similarity index 100% rename from CryptoPP/trdlocal.cpp rename to lib/cryptopp/trdlocal.cpp diff --git a/CryptoPP/trdlocal.h b/lib/cryptopp/trdlocal.h similarity index 100% rename from CryptoPP/trdlocal.h rename to lib/cryptopp/trdlocal.h diff --git a/CryptoPP/trunhash.h b/lib/cryptopp/trunhash.h similarity index 100% rename from CryptoPP/trunhash.h rename to lib/cryptopp/trunhash.h diff --git a/CryptoPP/ttmac.cpp b/lib/cryptopp/ttmac.cpp similarity index 100% rename from CryptoPP/ttmac.cpp rename to lib/cryptopp/ttmac.cpp diff --git a/CryptoPP/ttmac.h b/lib/cryptopp/ttmac.h similarity index 100% rename from CryptoPP/ttmac.h rename to lib/cryptopp/ttmac.h diff --git a/CryptoPP/validate.h b/lib/cryptopp/validate.h similarity index 100% rename from CryptoPP/validate.h rename to lib/cryptopp/validate.h diff --git a/CryptoPP/vmac.cpp b/lib/cryptopp/vmac.cpp similarity index 100% rename from CryptoPP/vmac.cpp rename to lib/cryptopp/vmac.cpp diff --git a/CryptoPP/vmac.h b/lib/cryptopp/vmac.h similarity index 100% rename from CryptoPP/vmac.h rename to lib/cryptopp/vmac.h diff --git a/CryptoPP/wait.cpp b/lib/cryptopp/wait.cpp similarity index 100% rename from CryptoPP/wait.cpp rename to lib/cryptopp/wait.cpp diff --git a/CryptoPP/wait.h b/lib/cryptopp/wait.h similarity index 100% rename from CryptoPP/wait.h rename to lib/cryptopp/wait.h diff --git a/CryptoPP/winpipes.cpp b/lib/cryptopp/winpipes.cpp similarity index 100% rename from CryptoPP/winpipes.cpp rename to lib/cryptopp/winpipes.cpp diff --git a/CryptoPP/winpipes.h b/lib/cryptopp/winpipes.h similarity index 100% rename from CryptoPP/winpipes.h rename to lib/cryptopp/winpipes.h diff --git a/CryptoPP/words.h b/lib/cryptopp/words.h similarity index 100% rename from CryptoPP/words.h rename to lib/cryptopp/words.h diff --git a/expat/ascii.h b/lib/expat/ascii.h similarity index 100% rename from expat/ascii.h rename to lib/expat/ascii.h diff --git a/expat/asciitab.h b/lib/expat/asciitab.h similarity index 100% rename from expat/asciitab.h rename to lib/expat/asciitab.h diff --git a/expat/expat.h b/lib/expat/expat.h similarity index 100% rename from expat/expat.h rename to lib/expat/expat.h diff --git a/expat/expat_external.h b/lib/expat/expat_external.h similarity index 100% rename from expat/expat_external.h rename to lib/expat/expat_external.h diff --git a/expat/iasciitab.h b/lib/expat/iasciitab.h similarity index 100% rename from expat/iasciitab.h rename to lib/expat/iasciitab.h diff --git a/expat/internal.h b/lib/expat/internal.h similarity index 100% rename from expat/internal.h rename to lib/expat/internal.h diff --git a/expat/latin1tab.h b/lib/expat/latin1tab.h similarity index 100% rename from expat/latin1tab.h rename to lib/expat/latin1tab.h diff --git a/expat/nametab.h b/lib/expat/nametab.h similarity index 100% rename from expat/nametab.h rename to lib/expat/nametab.h diff --git a/expat/utf8tab.h b/lib/expat/utf8tab.h similarity index 100% rename from expat/utf8tab.h rename to lib/expat/utf8tab.h diff --git a/expat/winconfig.h b/lib/expat/winconfig.h similarity index 100% rename from expat/winconfig.h rename to lib/expat/winconfig.h diff --git a/expat/xmlparse.c b/lib/expat/xmlparse.c similarity index 100% rename from expat/xmlparse.c rename to lib/expat/xmlparse.c diff --git a/expat/xmlrole.c b/lib/expat/xmlrole.c similarity index 100% rename from expat/xmlrole.c rename to lib/expat/xmlrole.c diff --git a/expat/xmlrole.h b/lib/expat/xmlrole.h similarity index 100% rename from expat/xmlrole.h rename to lib/expat/xmlrole.h diff --git a/expat/xmltok.c b/lib/expat/xmltok.c similarity index 100% rename from expat/xmltok.c rename to lib/expat/xmltok.c diff --git a/expat/xmltok.h b/lib/expat/xmltok.h similarity index 100% rename from expat/xmltok.h rename to lib/expat/xmltok.h diff --git a/expat/xmltok_impl.c b/lib/expat/xmltok_impl.c similarity index 100% rename from expat/xmltok_impl.c rename to lib/expat/xmltok_impl.c diff --git a/expat/xmltok_impl.h b/lib/expat/xmltok_impl.h similarity index 100% rename from expat/xmltok_impl.h rename to lib/expat/xmltok_impl.h diff --git a/expat/xmltok_ns.c b/lib/expat/xmltok_ns.c similarity index 100% rename from expat/xmltok_ns.c rename to lib/expat/xmltok_ns.c diff --git a/iniFile/iniFile.cpp b/lib/inifile/iniFile.cpp similarity index 100% rename from iniFile/iniFile.cpp rename to lib/inifile/iniFile.cpp diff --git a/iniFile/iniFile.h b/lib/inifile/iniFile.h similarity index 100% rename from iniFile/iniFile.h rename to lib/inifile/iniFile.h diff --git a/jsoncpp-src-0.5.0/include/json/autolink.h b/lib/jsoncpp/include/json/autolink.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/autolink.h rename to lib/jsoncpp/include/json/autolink.h diff --git a/jsoncpp-src-0.5.0/include/json/config.h b/lib/jsoncpp/include/json/config.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/config.h rename to lib/jsoncpp/include/json/config.h diff --git a/jsoncpp-src-0.5.0/include/json/features.h b/lib/jsoncpp/include/json/features.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/features.h rename to lib/jsoncpp/include/json/features.h diff --git a/jsoncpp-src-0.5.0/include/json/forwards.h b/lib/jsoncpp/include/json/forwards.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/forwards.h rename to lib/jsoncpp/include/json/forwards.h diff --git a/jsoncpp-src-0.5.0/include/json/json.h b/lib/jsoncpp/include/json/json.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/json.h rename to lib/jsoncpp/include/json/json.h diff --git a/jsoncpp-src-0.5.0/include/json/reader.h b/lib/jsoncpp/include/json/reader.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/reader.h rename to lib/jsoncpp/include/json/reader.h diff --git a/jsoncpp-src-0.5.0/include/json/value.h b/lib/jsoncpp/include/json/value.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/value.h rename to lib/jsoncpp/include/json/value.h diff --git a/jsoncpp-src-0.5.0/include/json/writer.h b/lib/jsoncpp/include/json/writer.h similarity index 100% rename from jsoncpp-src-0.5.0/include/json/writer.h rename to lib/jsoncpp/include/json/writer.h diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_batchallocator.h b/lib/jsoncpp/src/lib_json/json_batchallocator.h similarity index 100% rename from jsoncpp-src-0.5.0/src/lib_json/json_batchallocator.h rename to lib/jsoncpp/src/lib_json/json_batchallocator.h diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_internalarray.inl b/lib/jsoncpp/src/lib_json/json_internalarray.inl similarity index 100% rename from jsoncpp-src-0.5.0/src/lib_json/json_internalarray.inl rename to lib/jsoncpp/src/lib_json/json_internalarray.inl diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_internalmap.inl b/lib/jsoncpp/src/lib_json/json_internalmap.inl similarity index 100% rename from jsoncpp-src-0.5.0/src/lib_json/json_internalmap.inl rename to lib/jsoncpp/src/lib_json/json_internalmap.inl diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_reader.cpp b/lib/jsoncpp/src/lib_json/json_reader.cpp similarity index 99% rename from jsoncpp-src-0.5.0/src/lib_json/json_reader.cpp rename to lib/jsoncpp/src/lib_json/json_reader.cpp index 7c94e612e..e9d6b88d2 100644 --- a/jsoncpp-src-0.5.0/src/lib_json/json_reader.cpp +++ b/lib/jsoncpp/src/lib_json/json_reader.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "../../include/json/reader.h" +#include "../../include/json/value.h" #include #include #include diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_value.cpp b/lib/jsoncpp/src/lib_json/json_value.cpp similarity index 99% rename from jsoncpp-src-0.5.0/src/lib_json/json_value.cpp rename to lib/jsoncpp/src/lib_json/json_value.cpp index 89271cd00..ea033c400 100644 --- a/jsoncpp-src-0.5.0/src/lib_json/json_value.cpp +++ b/lib/jsoncpp/src/lib_json/json_value.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "../../include/json/json.h" +#include "../../include/json/writer.h" #include #include #include diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_valueiterator.inl b/lib/jsoncpp/src/lib_json/json_valueiterator.inl similarity index 100% rename from jsoncpp-src-0.5.0/src/lib_json/json_valueiterator.inl rename to lib/jsoncpp/src/lib_json/json_valueiterator.inl diff --git a/jsoncpp-src-0.5.0/src/lib_json/json_writer.cpp b/lib/jsoncpp/src/lib_json/json_writer.cpp similarity index 99% rename from jsoncpp-src-0.5.0/src/lib_json/json_writer.cpp rename to lib/jsoncpp/src/lib_json/json_writer.cpp index cdf4188f2..eff3fabeb 100644 --- a/jsoncpp-src-0.5.0/src/lib_json/json_writer.cpp +++ b/lib/jsoncpp/src/lib_json/json_writer.cpp @@ -1,4 +1,4 @@ -#include +#include "../../include/json/writer.h" #include #include #include diff --git a/jsoncpp-src-0.5.0/src/lib_json/sconscript b/lib/jsoncpp/src/lib_json/sconscript similarity index 100% rename from jsoncpp-src-0.5.0/src/lib_json/sconscript rename to lib/jsoncpp/src/lib_json/sconscript diff --git a/lua-5.1.4/COPYRIGHT b/lib/lua/COPYRIGHT similarity index 100% rename from lua-5.1.4/COPYRIGHT rename to lib/lua/COPYRIGHT diff --git a/lua-5.1.4/HISTORY b/lib/lua/HISTORY similarity index 100% rename from lua-5.1.4/HISTORY rename to lib/lua/HISTORY diff --git a/lua-5.1.4/INSTALL b/lib/lua/INSTALL similarity index 100% rename from lua-5.1.4/INSTALL rename to lib/lua/INSTALL diff --git a/lua-5.1.4/Makefile b/lib/lua/Makefile similarity index 100% rename from lua-5.1.4/Makefile rename to lib/lua/Makefile diff --git a/lua-5.1.4/README b/lib/lua/README similarity index 100% rename from lua-5.1.4/README rename to lib/lua/README diff --git a/lua-5.1.4/src/Makefile b/lib/lua/src/Makefile similarity index 100% rename from lua-5.1.4/src/Makefile rename to lib/lua/src/Makefile diff --git a/lua-5.1.4/src/lapi.c b/lib/lua/src/lapi.c similarity index 100% rename from lua-5.1.4/src/lapi.c rename to lib/lua/src/lapi.c diff --git a/lua-5.1.4/src/lapi.h b/lib/lua/src/lapi.h similarity index 100% rename from lua-5.1.4/src/lapi.h rename to lib/lua/src/lapi.h diff --git a/lua-5.1.4/src/lauxlib.c b/lib/lua/src/lauxlib.c similarity index 100% rename from lua-5.1.4/src/lauxlib.c rename to lib/lua/src/lauxlib.c diff --git a/lua-5.1.4/src/lauxlib.h b/lib/lua/src/lauxlib.h similarity index 100% rename from lua-5.1.4/src/lauxlib.h rename to lib/lua/src/lauxlib.h diff --git a/lua-5.1.4/src/lbaselib.c b/lib/lua/src/lbaselib.c similarity index 100% rename from lua-5.1.4/src/lbaselib.c rename to lib/lua/src/lbaselib.c diff --git a/lua-5.1.4/src/lcode.c b/lib/lua/src/lcode.c similarity index 100% rename from lua-5.1.4/src/lcode.c rename to lib/lua/src/lcode.c diff --git a/lua-5.1.4/src/lcode.h b/lib/lua/src/lcode.h similarity index 100% rename from lua-5.1.4/src/lcode.h rename to lib/lua/src/lcode.h diff --git a/lua-5.1.4/src/ldblib.c b/lib/lua/src/ldblib.c similarity index 100% rename from lua-5.1.4/src/ldblib.c rename to lib/lua/src/ldblib.c diff --git a/lua-5.1.4/src/ldebug.c b/lib/lua/src/ldebug.c similarity index 100% rename from lua-5.1.4/src/ldebug.c rename to lib/lua/src/ldebug.c diff --git a/lua-5.1.4/src/ldebug.h b/lib/lua/src/ldebug.h similarity index 100% rename from lua-5.1.4/src/ldebug.h rename to lib/lua/src/ldebug.h diff --git a/lua-5.1.4/src/ldo.c b/lib/lua/src/ldo.c similarity index 100% rename from lua-5.1.4/src/ldo.c rename to lib/lua/src/ldo.c diff --git a/lua-5.1.4/src/ldo.h b/lib/lua/src/ldo.h similarity index 100% rename from lua-5.1.4/src/ldo.h rename to lib/lua/src/ldo.h diff --git a/lua-5.1.4/src/ldump.c b/lib/lua/src/ldump.c similarity index 100% rename from lua-5.1.4/src/ldump.c rename to lib/lua/src/ldump.c diff --git a/lua-5.1.4/src/lfunc.c b/lib/lua/src/lfunc.c similarity index 100% rename from lua-5.1.4/src/lfunc.c rename to lib/lua/src/lfunc.c diff --git a/lua-5.1.4/src/lfunc.h b/lib/lua/src/lfunc.h similarity index 100% rename from lua-5.1.4/src/lfunc.h rename to lib/lua/src/lfunc.h diff --git a/lua-5.1.4/src/lgc.c b/lib/lua/src/lgc.c similarity index 100% rename from lua-5.1.4/src/lgc.c rename to lib/lua/src/lgc.c diff --git a/lua-5.1.4/src/lgc.h b/lib/lua/src/lgc.h similarity index 100% rename from lua-5.1.4/src/lgc.h rename to lib/lua/src/lgc.h diff --git a/lua-5.1.4/src/linit.c b/lib/lua/src/linit.c similarity index 100% rename from lua-5.1.4/src/linit.c rename to lib/lua/src/linit.c diff --git a/lua-5.1.4/src/liolib.c b/lib/lua/src/liolib.c similarity index 100% rename from lua-5.1.4/src/liolib.c rename to lib/lua/src/liolib.c diff --git a/lua-5.1.4/src/llex.c b/lib/lua/src/llex.c similarity index 100% rename from lua-5.1.4/src/llex.c rename to lib/lua/src/llex.c diff --git a/lua-5.1.4/src/llex.h b/lib/lua/src/llex.h similarity index 100% rename from lua-5.1.4/src/llex.h rename to lib/lua/src/llex.h diff --git a/lua-5.1.4/src/llimits.h b/lib/lua/src/llimits.h similarity index 100% rename from lua-5.1.4/src/llimits.h rename to lib/lua/src/llimits.h diff --git a/lua-5.1.4/src/lmathlib.c b/lib/lua/src/lmathlib.c similarity index 100% rename from lua-5.1.4/src/lmathlib.c rename to lib/lua/src/lmathlib.c diff --git a/lua-5.1.4/src/lmem.c b/lib/lua/src/lmem.c similarity index 100% rename from lua-5.1.4/src/lmem.c rename to lib/lua/src/lmem.c diff --git a/lua-5.1.4/src/lmem.h b/lib/lua/src/lmem.h similarity index 100% rename from lua-5.1.4/src/lmem.h rename to lib/lua/src/lmem.h diff --git a/lua-5.1.4/src/loadlib.c b/lib/lua/src/loadlib.c similarity index 100% rename from lua-5.1.4/src/loadlib.c rename to lib/lua/src/loadlib.c diff --git a/lua-5.1.4/src/lobject.c b/lib/lua/src/lobject.c similarity index 100% rename from lua-5.1.4/src/lobject.c rename to lib/lua/src/lobject.c diff --git a/lua-5.1.4/src/lobject.h b/lib/lua/src/lobject.h similarity index 100% rename from lua-5.1.4/src/lobject.h rename to lib/lua/src/lobject.h diff --git a/lua-5.1.4/src/lopcodes.c b/lib/lua/src/lopcodes.c similarity index 100% rename from lua-5.1.4/src/lopcodes.c rename to lib/lua/src/lopcodes.c diff --git a/lua-5.1.4/src/lopcodes.h b/lib/lua/src/lopcodes.h similarity index 100% rename from lua-5.1.4/src/lopcodes.h rename to lib/lua/src/lopcodes.h diff --git a/lua-5.1.4/src/loslib.c b/lib/lua/src/loslib.c similarity index 100% rename from lua-5.1.4/src/loslib.c rename to lib/lua/src/loslib.c diff --git a/lua-5.1.4/src/lparser.c b/lib/lua/src/lparser.c similarity index 100% rename from lua-5.1.4/src/lparser.c rename to lib/lua/src/lparser.c diff --git a/lua-5.1.4/src/lparser.h b/lib/lua/src/lparser.h similarity index 100% rename from lua-5.1.4/src/lparser.h rename to lib/lua/src/lparser.h diff --git a/lua-5.1.4/src/lstate.c b/lib/lua/src/lstate.c similarity index 100% rename from lua-5.1.4/src/lstate.c rename to lib/lua/src/lstate.c diff --git a/lua-5.1.4/src/lstate.h b/lib/lua/src/lstate.h similarity index 100% rename from lua-5.1.4/src/lstate.h rename to lib/lua/src/lstate.h diff --git a/lua-5.1.4/src/lstring.c b/lib/lua/src/lstring.c similarity index 100% rename from lua-5.1.4/src/lstring.c rename to lib/lua/src/lstring.c diff --git a/lua-5.1.4/src/lstring.h b/lib/lua/src/lstring.h similarity index 100% rename from lua-5.1.4/src/lstring.h rename to lib/lua/src/lstring.h diff --git a/lua-5.1.4/src/lstrlib.c b/lib/lua/src/lstrlib.c similarity index 100% rename from lua-5.1.4/src/lstrlib.c rename to lib/lua/src/lstrlib.c diff --git a/lua-5.1.4/src/ltable.c b/lib/lua/src/ltable.c similarity index 100% rename from lua-5.1.4/src/ltable.c rename to lib/lua/src/ltable.c diff --git a/lua-5.1.4/src/ltable.h b/lib/lua/src/ltable.h similarity index 100% rename from lua-5.1.4/src/ltable.h rename to lib/lua/src/ltable.h diff --git a/lua-5.1.4/src/ltablib.c b/lib/lua/src/ltablib.c similarity index 100% rename from lua-5.1.4/src/ltablib.c rename to lib/lua/src/ltablib.c diff --git a/lua-5.1.4/src/ltm.c b/lib/lua/src/ltm.c similarity index 100% rename from lua-5.1.4/src/ltm.c rename to lib/lua/src/ltm.c diff --git a/lua-5.1.4/src/ltm.h b/lib/lua/src/ltm.h similarity index 100% rename from lua-5.1.4/src/ltm.h rename to lib/lua/src/ltm.h diff --git a/lua-5.1.4/src/lua.c b/lib/lua/src/lua.c similarity index 100% rename from lua-5.1.4/src/lua.c rename to lib/lua/src/lua.c diff --git a/lua-5.1.4/src/lua.h b/lib/lua/src/lua.h similarity index 100% rename from lua-5.1.4/src/lua.h rename to lib/lua/src/lua.h diff --git a/lua-5.1.4/src/luac.c b/lib/lua/src/luac.c similarity index 100% rename from lua-5.1.4/src/luac.c rename to lib/lua/src/luac.c diff --git a/lua-5.1.4/src/luaconf.h b/lib/lua/src/luaconf.h similarity index 100% rename from lua-5.1.4/src/luaconf.h rename to lib/lua/src/luaconf.h diff --git a/lua-5.1.4/src/lualib.h b/lib/lua/src/lualib.h similarity index 100% rename from lua-5.1.4/src/lualib.h rename to lib/lua/src/lualib.h diff --git a/lua-5.1.4/src/lundump.c b/lib/lua/src/lundump.c similarity index 100% rename from lua-5.1.4/src/lundump.c rename to lib/lua/src/lundump.c diff --git a/lua-5.1.4/src/lundump.h b/lib/lua/src/lundump.h similarity index 100% rename from lua-5.1.4/src/lundump.h rename to lib/lua/src/lundump.h diff --git a/lua-5.1.4/src/lvm.c b/lib/lua/src/lvm.c similarity index 100% rename from lua-5.1.4/src/lvm.c rename to lib/lua/src/lvm.c diff --git a/lua-5.1.4/src/lvm.h b/lib/lua/src/lvm.h similarity index 100% rename from lua-5.1.4/src/lvm.h rename to lib/lua/src/lvm.h diff --git a/lua-5.1.4/src/lzio.c b/lib/lua/src/lzio.c similarity index 100% rename from lua-5.1.4/src/lzio.c rename to lib/lua/src/lzio.c diff --git a/lua-5.1.4/src/lzio.h b/lib/lua/src/lzio.h similarity index 100% rename from lua-5.1.4/src/lzio.h rename to lib/lua/src/lzio.h diff --git a/lua-5.1.4/src/print.c b/lib/lua/src/print.c similarity index 100% rename from lua-5.1.4/src/print.c rename to lib/lua/src/print.c diff --git a/source/LuaExpat/lxplib.c b/lib/luaexpat/lxplib.c similarity index 99% rename from source/LuaExpat/lxplib.c rename to lib/luaexpat/lxplib.c index e26343ce9..1a36104a8 100644 --- a/source/LuaExpat/lxplib.c +++ b/lib/luaexpat/lxplib.c @@ -9,10 +9,10 @@ #include #include -#include "expat.h" +#include "expat/expat.h" -#include "lua.h" -#include "lauxlib.h" +#include "lua/src/lua.h" +#include "lua/src/lauxlib.h" #include "lxplib.h" diff --git a/source/LuaExpat/lxplib.h b/lib/luaexpat/lxplib.h similarity index 100% rename from source/LuaExpat/lxplib.h rename to lib/luaexpat/lxplib.h diff --git a/source/md5/md5.cpp b/lib/md5/md5.cpp similarity index 100% rename from source/md5/md5.cpp rename to lib/md5/md5.cpp diff --git a/source/md5/md5.h b/lib/md5/md5.h similarity index 100% rename from source/md5/md5.h rename to lib/md5/md5.h diff --git a/source/SQLite/lsqlite3.c b/lib/sqlite/lsqlite3.c similarity index 99% rename from source/SQLite/lsqlite3.c rename to lib/sqlite/lsqlite3.c index 4c81b5878..cf2c62597 100644 --- a/source/SQLite/lsqlite3.c +++ b/lib/sqlite/lsqlite3.c @@ -44,8 +44,8 @@ extern "C" { #include #define LUA_LIB -#include "lua.h" -#include "lauxlib.h" +#include "lua/src/lua.h" +#include "lua/src/lauxlib.h" #if LUA_VERSION_NUM > 501 // diff --git a/source/SQLite/sqlite3.c b/lib/sqlite/sqlite3.c similarity index 100% rename from source/SQLite/sqlite3.c rename to lib/sqlite/sqlite3.c diff --git a/source/SQLite/sqlite3.h b/lib/sqlite/sqlite3.h similarity index 100% rename from source/SQLite/sqlite3.h rename to lib/sqlite/sqlite3.h diff --git a/source/SQLite/urls.txt b/lib/sqlite/urls.txt similarity index 100% rename from source/SQLite/urls.txt rename to lib/sqlite/urls.txt diff --git a/tolua++-1.0.93/COPYRIGHT b/lib/tolua++/COPYRIGHT similarity index 100% rename from tolua++-1.0.93/COPYRIGHT rename to lib/tolua++/COPYRIGHT diff --git a/tolua++-1.0.93/INSTALL b/lib/tolua++/INSTALL similarity index 100% rename from tolua++-1.0.93/INSTALL rename to lib/tolua++/INSTALL diff --git a/tolua++-1.0.93/Makefile b/lib/tolua++/Makefile similarity index 100% rename from tolua++-1.0.93/Makefile rename to lib/tolua++/Makefile diff --git a/tolua++-1.0.93/README b/lib/tolua++/README similarity index 100% rename from tolua++-1.0.93/README rename to lib/tolua++/README diff --git a/tolua++-1.0.93/README-5.1 b/lib/tolua++/README-5.1 similarity index 100% rename from tolua++-1.0.93/README-5.1 rename to lib/tolua++/README-5.1 diff --git a/tolua++-1.0.93/SConstruct b/lib/tolua++/SConstruct similarity index 100% rename from tolua++-1.0.93/SConstruct rename to lib/tolua++/SConstruct diff --git a/tolua++-1.0.93/include/tolua++.h b/lib/tolua++/include/tolua++.h similarity index 99% rename from tolua++-1.0.93/include/tolua++.h rename to lib/tolua++/include/tolua++.h index ed5344926..3ebd8d246 100644 --- a/tolua++-1.0.93/include/tolua++.h +++ b/lib/tolua++/include/tolua++.h @@ -43,8 +43,8 @@ extern "C" { typedef int lua_Object; -#include "lua.h" -#include "lauxlib.h" +#include "../../lua/src/lua.h" +#include "../../lua/src/lauxlib.h" struct tolua_Error { diff --git a/tolua++-1.0.93/src/bin/SCsub b/lib/tolua++/src/bin/SCsub similarity index 100% rename from tolua++-1.0.93/src/bin/SCsub rename to lib/tolua++/src/bin/SCsub diff --git a/tolua++-1.0.93/src/bin/lua/all.lua b/lib/tolua++/src/bin/lua/all.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/all.lua rename to lib/tolua++/src/bin/lua/all.lua diff --git a/tolua++-1.0.93/src/bin/lua/array.lua b/lib/tolua++/src/bin/lua/array.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/array.lua rename to lib/tolua++/src/bin/lua/array.lua diff --git a/tolua++-1.0.93/src/bin/lua/basic.lua b/lib/tolua++/src/bin/lua/basic.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/basic.lua rename to lib/tolua++/src/bin/lua/basic.lua diff --git a/tolua++-1.0.93/src/bin/lua/class.lua b/lib/tolua++/src/bin/lua/class.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/class.lua rename to lib/tolua++/src/bin/lua/class.lua diff --git a/tolua++-1.0.93/src/bin/lua/clean.lua b/lib/tolua++/src/bin/lua/clean.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/clean.lua rename to lib/tolua++/src/bin/lua/clean.lua diff --git a/tolua++-1.0.93/src/bin/lua/code.lua b/lib/tolua++/src/bin/lua/code.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/code.lua rename to lib/tolua++/src/bin/lua/code.lua diff --git a/tolua++-1.0.93/src/bin/lua/compat-5.1.lua b/lib/tolua++/src/bin/lua/compat-5.1.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/compat-5.1.lua rename to lib/tolua++/src/bin/lua/compat-5.1.lua diff --git a/tolua++-1.0.93/src/bin/lua/compat.lua b/lib/tolua++/src/bin/lua/compat.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/compat.lua rename to lib/tolua++/src/bin/lua/compat.lua diff --git a/tolua++-1.0.93/src/bin/lua/container.lua b/lib/tolua++/src/bin/lua/container.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/container.lua rename to lib/tolua++/src/bin/lua/container.lua diff --git a/tolua++-1.0.93/src/bin/lua/custom.lua b/lib/tolua++/src/bin/lua/custom.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/custom.lua rename to lib/tolua++/src/bin/lua/custom.lua diff --git a/tolua++-1.0.93/src/bin/lua/declaration.lua b/lib/tolua++/src/bin/lua/declaration.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/declaration.lua rename to lib/tolua++/src/bin/lua/declaration.lua diff --git a/tolua++-1.0.93/src/bin/lua/define.lua b/lib/tolua++/src/bin/lua/define.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/define.lua rename to lib/tolua++/src/bin/lua/define.lua diff --git a/tolua++-1.0.93/src/bin/lua/doit.lua b/lib/tolua++/src/bin/lua/doit.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/doit.lua rename to lib/tolua++/src/bin/lua/doit.lua diff --git a/tolua++-1.0.93/src/bin/lua/enumerate.lua b/lib/tolua++/src/bin/lua/enumerate.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/enumerate.lua rename to lib/tolua++/src/bin/lua/enumerate.lua diff --git a/tolua++-1.0.93/src/bin/lua/feature.lua b/lib/tolua++/src/bin/lua/feature.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/feature.lua rename to lib/tolua++/src/bin/lua/feature.lua diff --git a/tolua++-1.0.93/src/bin/lua/function.lua b/lib/tolua++/src/bin/lua/function.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/function.lua rename to lib/tolua++/src/bin/lua/function.lua diff --git a/tolua++-1.0.93/src/bin/lua/module.lua b/lib/tolua++/src/bin/lua/module.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/module.lua rename to lib/tolua++/src/bin/lua/module.lua diff --git a/tolua++-1.0.93/src/bin/lua/namespace.lua b/lib/tolua++/src/bin/lua/namespace.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/namespace.lua rename to lib/tolua++/src/bin/lua/namespace.lua diff --git a/tolua++-1.0.93/src/bin/lua/operator.lua b/lib/tolua++/src/bin/lua/operator.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/operator.lua rename to lib/tolua++/src/bin/lua/operator.lua diff --git a/tolua++-1.0.93/src/bin/lua/package.lua b/lib/tolua++/src/bin/lua/package.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/package.lua rename to lib/tolua++/src/bin/lua/package.lua diff --git a/tolua++-1.0.93/src/bin/lua/template_class.lua b/lib/tolua++/src/bin/lua/template_class.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/template_class.lua rename to lib/tolua++/src/bin/lua/template_class.lua diff --git a/tolua++-1.0.93/src/bin/lua/typedef.lua b/lib/tolua++/src/bin/lua/typedef.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/typedef.lua rename to lib/tolua++/src/bin/lua/typedef.lua diff --git a/tolua++-1.0.93/src/bin/lua/variable.lua b/lib/tolua++/src/bin/lua/variable.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/variable.lua rename to lib/tolua++/src/bin/lua/variable.lua diff --git a/tolua++-1.0.93/src/bin/lua/verbatim.lua b/lib/tolua++/src/bin/lua/verbatim.lua similarity index 100% rename from tolua++-1.0.93/src/bin/lua/verbatim.lua rename to lib/tolua++/src/bin/lua/verbatim.lua diff --git a/tolua++-1.0.93/src/bin/tolua.c b/lib/tolua++/src/bin/tolua.c similarity index 96% rename from tolua++-1.0.93/src/bin/tolua.c rename to lib/tolua++/src/bin/tolua.c index cc9f9adcd..fd8e1ed1e 100644 --- a/tolua++-1.0.93/src/bin/tolua.c +++ b/lib/tolua++/src/bin/tolua.c @@ -12,11 +12,11 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" +#include "../../../lua/src/lua.h" +#include "../../../lua/src/lualib.h" +#include "../../../lua/src/lauxlib.h" #include #include diff --git a/tolua++-1.0.93/src/bin/tolua_scons.pkg b/lib/tolua++/src/bin/tolua_scons.pkg similarity index 100% rename from tolua++-1.0.93/src/bin/tolua_scons.pkg rename to lib/tolua++/src/bin/tolua_scons.pkg diff --git a/tolua++-1.0.93/src/bin/toluabind.c b/lib/tolua++/src/bin/toluabind.c similarity index 100% rename from tolua++-1.0.93/src/bin/toluabind.c rename to lib/tolua++/src/bin/toluabind.c diff --git a/tolua++-1.0.93/src/bin/toluabind.h b/lib/tolua++/src/bin/toluabind.h similarity index 100% rename from tolua++-1.0.93/src/bin/toluabind.h rename to lib/tolua++/src/bin/toluabind.h diff --git a/tolua++-1.0.93/src/bin/toluabind_default.c b/lib/tolua++/src/bin/toluabind_default.c similarity index 100% rename from tolua++-1.0.93/src/bin/toluabind_default.c rename to lib/tolua++/src/bin/toluabind_default.c diff --git a/tolua++-1.0.93/src/bin/toluabind_default.h b/lib/tolua++/src/bin/toluabind_default.h similarity index 100% rename from tolua++-1.0.93/src/bin/toluabind_default.h rename to lib/tolua++/src/bin/toluabind_default.h diff --git a/tolua++-1.0.93/src/lib/SCsub b/lib/tolua++/src/lib/SCsub similarity index 100% rename from tolua++-1.0.93/src/lib/SCsub rename to lib/tolua++/src/lib/SCsub diff --git a/tolua++-1.0.93/src/lib/tolua_event.c b/lib/tolua++/src/lib/tolua_event.c similarity index 99% rename from tolua++-1.0.93/src/lib/tolua_event.c rename to lib/tolua++/src/lib/tolua_event.c index 8258867b4..3075a60b3 100644 --- a/tolua++-1.0.93/src/lib/tolua_event.c +++ b/lib/tolua++/src/lib/tolua_event.c @@ -14,7 +14,7 @@ #include -#include "tolua++.h" +#include "../../include/tolua++.h" /* Store at ubox * It stores, creating the corresponding table if needed, diff --git a/tolua++-1.0.93/src/lib/tolua_event.h b/lib/tolua++/src/lib/tolua_event.h similarity index 100% rename from tolua++-1.0.93/src/lib/tolua_event.h rename to lib/tolua++/src/lib/tolua_event.h diff --git a/tolua++-1.0.93/src/lib/tolua_is.c b/lib/tolua++/src/lib/tolua_is.c similarity index 99% rename from tolua++-1.0.93/src/lib/tolua_is.c rename to lib/tolua++/src/lib/tolua_is.c index c486b271e..b470477ff 100644 --- a/tolua++-1.0.93/src/lib/tolua_is.c +++ b/lib/tolua++/src/lib/tolua_is.c @@ -12,8 +12,8 @@ ** enhancements, or modifications. */ -#include "tolua++.h" -#include "lauxlib.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include #include diff --git a/tolua++-1.0.93/src/lib/tolua_map.c b/lib/tolua++/src/lib/tolua_map.c similarity index 99% rename from tolua++-1.0.93/src/lib/tolua_map.c rename to lib/tolua++/src/lib/tolua_map.c index d00e7069b..7c4a22336 100644 --- a/tolua++-1.0.93/src/lib/tolua_map.c +++ b/lib/tolua++/src/lib/tolua_map.c @@ -12,9 +12,9 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include "tolua_event.h" -#include "lauxlib.h" #include #include diff --git a/tolua++-1.0.93/src/lib/tolua_push.c b/lib/tolua++/src/lib/tolua_push.c similarity index 98% rename from tolua++-1.0.93/src/lib/tolua_push.c rename to lib/tolua++/src/lib/tolua_push.c index 639414755..947f0e7a5 100644 --- a/tolua++-1.0.93/src/lib/tolua_push.c +++ b/lib/tolua++/src/lib/tolua_push.c @@ -12,8 +12,8 @@ ** enhancements, or modifications. */ -#include "tolua++.h" -#include "lauxlib.h" +#include "../../include/tolua++.h" +#include "../../../lua/src/lauxlib.h" #include diff --git a/tolua++-1.0.93/src/lib/tolua_to.c b/lib/tolua++/src/lib/tolua_to.c similarity index 98% rename from tolua++-1.0.93/src/lib/tolua_to.c rename to lib/tolua++/src/lib/tolua_to.c index 542ca67d1..04132e901 100644 --- a/tolua++-1.0.93/src/lib/tolua_to.c +++ b/lib/tolua++/src/lib/tolua_to.c @@ -12,7 +12,7 @@ ** enhancements, or modifications. */ -#include "tolua++.h" +#include "../../include/tolua++.h" #include #include diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcproj b/lib/tolua++/win32/tolualib/tolualib.vcproj similarity index 100% rename from tolua++-1.0.93/win32/tolualib/tolualib.vcproj rename to lib/tolua++/win32/tolualib/tolualib.vcproj diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcproj.LAPTOPF.Kevin.user b/lib/tolua++/win32/tolualib/tolualib.vcproj.LAPTOPF.Kevin.user similarity index 100% rename from tolua++-1.0.93/win32/tolualib/tolualib.vcproj.LAPTOPF.Kevin.user rename to lib/tolua++/win32/tolualib/tolualib.vcproj.LAPTOPF.Kevin.user diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcxproj b/lib/tolua++/win32/tolualib/tolualib.vcxproj similarity index 100% rename from tolua++-1.0.93/win32/tolualib/tolualib.vcxproj rename to lib/tolua++/win32/tolualib/tolualib.vcxproj diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcxproj.filters b/lib/tolua++/win32/tolualib/tolualib.vcxproj.filters similarity index 100% rename from tolua++-1.0.93/win32/tolualib/tolualib.vcxproj.filters rename to lib/tolua++/win32/tolualib/tolualib.vcxproj.filters diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcxproj.user b/lib/tolua++/win32/tolualib/tolualib.vcxproj.user similarity index 100% rename from tolua++-1.0.93/win32/tolualib/tolualib.vcxproj.user rename to lib/tolua++/win32/tolualib/tolualib.vcxproj.user diff --git a/tolua++-1.0.93/win32/vc7/clean.bat b/lib/tolua++/win32/vc7/clean.bat similarity index 100% rename from tolua++-1.0.93/win32/vc7/clean.bat rename to lib/tolua++/win32/vc7/clean.bat diff --git a/tolua++-1.0.93/win32/vc7/toluapp.sln b/lib/tolua++/win32/vc7/toluapp.sln similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.sln rename to lib/tolua++/win32/vc7/toluapp.sln diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcproj b/lib/tolua++/win32/vc7/toluapp.vcproj similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.vcproj rename to lib/tolua++/win32/vc7/toluapp.vcproj diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcproj.LAPTOPF.Kevin.user b/lib/tolua++/win32/vc7/toluapp.vcproj.LAPTOPF.Kevin.user similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.vcproj.LAPTOPF.Kevin.user rename to lib/tolua++/win32/vc7/toluapp.vcproj.LAPTOPF.Kevin.user diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcxproj b/lib/tolua++/win32/vc7/toluapp.vcxproj similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.vcxproj rename to lib/tolua++/win32/vc7/toluapp.vcxproj diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcxproj.filters b/lib/tolua++/win32/vc7/toluapp.vcxproj.filters similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.vcxproj.filters rename to lib/tolua++/win32/vc7/toluapp.vcxproj.filters diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcxproj.user b/lib/tolua++/win32/vc7/toluapp.vcxproj.user similarity index 100% rename from tolua++-1.0.93/win32/vc7/toluapp.vcxproj.user rename to lib/tolua++/win32/vc7/toluapp.vcxproj.user diff --git a/zlib-1.2.7/adler32.c b/lib/zlib/adler32.c similarity index 100% rename from zlib-1.2.7/adler32.c rename to lib/zlib/adler32.c diff --git a/zlib-1.2.7/compress.c b/lib/zlib/compress.c similarity index 100% rename from zlib-1.2.7/compress.c rename to lib/zlib/compress.c diff --git a/zlib-1.2.7/crc32.c b/lib/zlib/crc32.c similarity index 100% rename from zlib-1.2.7/crc32.c rename to lib/zlib/crc32.c diff --git a/zlib-1.2.7/crc32.h b/lib/zlib/crc32.h similarity index 100% rename from zlib-1.2.7/crc32.h rename to lib/zlib/crc32.h diff --git a/zlib-1.2.7/deflate.c b/lib/zlib/deflate.c similarity index 100% rename from zlib-1.2.7/deflate.c rename to lib/zlib/deflate.c diff --git a/zlib-1.2.7/deflate.h b/lib/zlib/deflate.h similarity index 100% rename from zlib-1.2.7/deflate.h rename to lib/zlib/deflate.h diff --git a/zlib-1.2.7/example.c b/lib/zlib/example.c similarity index 100% rename from zlib-1.2.7/example.c rename to lib/zlib/example.c diff --git a/zlib-1.2.7/gzclose.c b/lib/zlib/gzclose.c similarity index 100% rename from zlib-1.2.7/gzclose.c rename to lib/zlib/gzclose.c diff --git a/zlib-1.2.7/gzguts.h b/lib/zlib/gzguts.h similarity index 100% rename from zlib-1.2.7/gzguts.h rename to lib/zlib/gzguts.h diff --git a/zlib-1.2.7/gzlib.c b/lib/zlib/gzlib.c similarity index 100% rename from zlib-1.2.7/gzlib.c rename to lib/zlib/gzlib.c diff --git a/zlib-1.2.7/gzread.c b/lib/zlib/gzread.c similarity index 100% rename from zlib-1.2.7/gzread.c rename to lib/zlib/gzread.c diff --git a/zlib-1.2.7/gzwrite.c b/lib/zlib/gzwrite.c similarity index 100% rename from zlib-1.2.7/gzwrite.c rename to lib/zlib/gzwrite.c diff --git a/zlib-1.2.7/infback.c b/lib/zlib/infback.c similarity index 100% rename from zlib-1.2.7/infback.c rename to lib/zlib/infback.c diff --git a/zlib-1.2.7/inffast.c b/lib/zlib/inffast.c similarity index 100% rename from zlib-1.2.7/inffast.c rename to lib/zlib/inffast.c diff --git a/zlib-1.2.7/inffast.h b/lib/zlib/inffast.h similarity index 100% rename from zlib-1.2.7/inffast.h rename to lib/zlib/inffast.h diff --git a/zlib-1.2.7/inffixed.h b/lib/zlib/inffixed.h similarity index 100% rename from zlib-1.2.7/inffixed.h rename to lib/zlib/inffixed.h diff --git a/zlib-1.2.7/inflate.c b/lib/zlib/inflate.c similarity index 100% rename from zlib-1.2.7/inflate.c rename to lib/zlib/inflate.c diff --git a/zlib-1.2.7/inflate.h b/lib/zlib/inflate.h similarity index 100% rename from zlib-1.2.7/inflate.h rename to lib/zlib/inflate.h diff --git a/zlib-1.2.7/inftrees.c b/lib/zlib/inftrees.c similarity index 100% rename from zlib-1.2.7/inftrees.c rename to lib/zlib/inftrees.c diff --git a/zlib-1.2.7/inftrees.h b/lib/zlib/inftrees.h similarity index 100% rename from zlib-1.2.7/inftrees.h rename to lib/zlib/inftrees.h diff --git a/zlib-1.2.7/minigzip.c b/lib/zlib/minigzip.c similarity index 100% rename from zlib-1.2.7/minigzip.c rename to lib/zlib/minigzip.c diff --git a/zlib-1.2.7/trees.c b/lib/zlib/trees.c similarity index 100% rename from zlib-1.2.7/trees.c rename to lib/zlib/trees.c diff --git a/zlib-1.2.7/trees.h b/lib/zlib/trees.h similarity index 100% rename from zlib-1.2.7/trees.h rename to lib/zlib/trees.h diff --git a/zlib-1.2.7/uncompr.c b/lib/zlib/uncompr.c similarity index 100% rename from zlib-1.2.7/uncompr.c rename to lib/zlib/uncompr.c diff --git a/zlib-1.2.7/zconf.h b/lib/zlib/zconf.h similarity index 100% rename from zlib-1.2.7/zconf.h rename to lib/zlib/zconf.h diff --git a/zlib-1.2.7/zlib.h b/lib/zlib/zlib.h similarity index 100% rename from zlib-1.2.7/zlib.h rename to lib/zlib/zlib.h diff --git a/zlib-1.2.7/zutil.c b/lib/zlib/zutil.c similarity index 100% rename from zlib-1.2.7/zutil.c rename to lib/zlib/zutil.c diff --git a/zlib-1.2.7/zutil.h b/lib/zlib/zutil.h similarity index 100% rename from zlib-1.2.7/zutil.h rename to lib/zlib/zutil.h diff --git a/source/AllToLua.bat b/src/AllToLua.bat similarity index 100% rename from source/AllToLua.bat rename to src/AllToLua.bat diff --git a/source/AllToLua.pkg b/src/AllToLua.pkg similarity index 98% rename from source/AllToLua.pkg rename to src/AllToLua.pkg index ee594be1a..fe9217104 100644 --- a/source/AllToLua.pkg +++ b/src/AllToLua.pkg @@ -15,7 +15,7 @@ typedef unsigned short UInt16; $cfile "ChunkDef.h" -$cfile "../iniFile/iniFile.h" +$cfile "../lib/inifile/iniFile.h" $cfile "OSSupport/File.h" diff --git a/source/AllToLua.sh b/src/AllToLua.sh similarity index 100% rename from source/AllToLua.sh rename to src/AllToLua.sh diff --git a/source/Authenticator.cpp b/src/Authenticator.cpp similarity index 99% rename from source/Authenticator.cpp rename to src/Authenticator.cpp index 9a6dcf51b..4cbe3beed 100644 --- a/source/Authenticator.cpp +++ b/src/Authenticator.cpp @@ -6,7 +6,7 @@ #include "Root.h" #include "Server.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include diff --git a/source/Authenticator.h b/src/Authenticator.h similarity index 100% rename from source/Authenticator.h rename to src/Authenticator.h diff --git a/source/Bindings.cpp b/src/Bindings.cpp similarity index 99% rename from source/Bindings.cpp rename to src/Bindings.cpp index 62a16b38b..f06fb4c03 100644 --- a/source/Bindings.cpp +++ b/src/Bindings.cpp @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 11/26/13 15:29:19. +** Generated automatically by tolua++-1.0.92 on 11/26/13 22:11:10. */ #ifndef __cplusplus @@ -16,7 +16,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S); #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "tolua_base.h" #include "ChunkDef.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "OSSupport/File.h" #include "BlockID.h" #include "StringUtils.h" diff --git a/source/Bindings.h b/src/Bindings.h similarity index 62% rename from source/Bindings.h rename to src/Bindings.h index 240ceec30..d141484db 100644 --- a/source/Bindings.h +++ b/src/Bindings.h @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 11/26/13 15:29:20. +** Generated automatically by tolua++-1.0.92 on 11/26/13 22:11:11. */ /* Exported function */ diff --git a/source/BlockArea.cpp b/src/BlockArea.cpp similarity index 100% rename from source/BlockArea.cpp rename to src/BlockArea.cpp diff --git a/source/BlockArea.h b/src/BlockArea.h similarity index 100% rename from source/BlockArea.h rename to src/BlockArea.h diff --git a/source/BlockEntities/BlockEntity.cpp b/src/BlockEntities/BlockEntity.cpp similarity index 100% rename from source/BlockEntities/BlockEntity.cpp rename to src/BlockEntities/BlockEntity.cpp diff --git a/source/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h similarity index 100% rename from source/BlockEntities/BlockEntity.h rename to src/BlockEntities/BlockEntity.h diff --git a/source/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h similarity index 100% rename from source/BlockEntities/BlockEntityWithItems.h rename to src/BlockEntities/BlockEntityWithItems.h diff --git a/source/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp similarity index 99% rename from source/BlockEntities/ChestEntity.cpp rename to src/BlockEntities/ChestEntity.cpp index ca2626bc9..dfbe6ae87 100644 --- a/source/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -5,7 +5,7 @@ #include "../Item.h" #include "../Entities/Player.h" #include "../UI/Window.h" -#include +#include "json/json.h" diff --git a/source/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h similarity index 100% rename from source/BlockEntities/ChestEntity.h rename to src/BlockEntities/ChestEntity.h diff --git a/source/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp similarity index 100% rename from source/BlockEntities/DispenserEntity.cpp rename to src/BlockEntities/DispenserEntity.cpp diff --git a/source/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h similarity index 100% rename from source/BlockEntities/DispenserEntity.h rename to src/BlockEntities/DispenserEntity.h diff --git a/source/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp similarity index 100% rename from source/BlockEntities/DropSpenserEntity.cpp rename to src/BlockEntities/DropSpenserEntity.cpp diff --git a/source/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h similarity index 100% rename from source/BlockEntities/DropSpenserEntity.h rename to src/BlockEntities/DropSpenserEntity.h diff --git a/source/BlockEntities/DropperEntity.cpp b/src/BlockEntities/DropperEntity.cpp similarity index 100% rename from source/BlockEntities/DropperEntity.cpp rename to src/BlockEntities/DropperEntity.cpp diff --git a/source/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h similarity index 100% rename from source/BlockEntities/DropperEntity.h rename to src/BlockEntities/DropperEntity.h diff --git a/source/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp similarity index 99% rename from source/BlockEntities/FurnaceEntity.cpp rename to src/BlockEntities/FurnaceEntity.cpp index ec5ebe8b9..b1409f5cc 100644 --- a/source/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -6,7 +6,7 @@ #include "../Entities/Player.h" #include "../Root.h" #include "../Chunk.h" -#include +#include "json/json.h" diff --git a/source/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h similarity index 100% rename from source/BlockEntities/FurnaceEntity.h rename to src/BlockEntities/FurnaceEntity.h diff --git a/source/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp similarity index 100% rename from source/BlockEntities/HopperEntity.cpp rename to src/BlockEntities/HopperEntity.cpp diff --git a/source/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h similarity index 100% rename from source/BlockEntities/HopperEntity.h rename to src/BlockEntities/HopperEntity.h diff --git a/source/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp similarity index 98% rename from source/BlockEntities/JukeboxEntity.cpp rename to src/BlockEntities/JukeboxEntity.cpp index aca376dd3..33042179d 100644 --- a/source/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -3,7 +3,7 @@ #include "JukeboxEntity.h" #include "../World.h" -#include +#include "json/json.h" diff --git a/source/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h similarity index 100% rename from source/BlockEntities/JukeboxEntity.h rename to src/BlockEntities/JukeboxEntity.h diff --git a/source/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp similarity index 99% rename from source/BlockEntities/NoteEntity.cpp rename to src/BlockEntities/NoteEntity.cpp index 1b0620299..9a33ead62 100644 --- a/source/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -3,7 +3,7 @@ #include "NoteEntity.h" #include "../World.h" -#include +#include "json/json.h" diff --git a/source/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h similarity index 100% rename from source/BlockEntities/NoteEntity.h rename to src/BlockEntities/NoteEntity.h diff --git a/source/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp similarity index 98% rename from source/BlockEntities/SignEntity.cpp rename to src/BlockEntities/SignEntity.cpp index 81f6f6d77..df8774377 100644 --- a/source/BlockEntities/SignEntity.cpp +++ b/src/BlockEntities/SignEntity.cpp @@ -4,7 +4,7 @@ // Implements the cSignEntity class representing a single sign in the world #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include +#include "json/json.h" #include "SignEntity.h" #include "../Entities/Player.h" diff --git a/source/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h similarity index 100% rename from source/BlockEntities/SignEntity.h rename to src/BlockEntities/SignEntity.h diff --git a/source/BlockID.cpp b/src/BlockID.cpp similarity index 99% rename from source/BlockID.cpp rename to src/BlockID.cpp index a4a1ab2d8..708618d25 100644 --- a/source/BlockID.cpp +++ b/src/BlockID.cpp @@ -4,7 +4,7 @@ #include "Globals.h" #include "BlockID.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "Item.h" #include "Mobs/Monster.h" diff --git a/source/BlockID.h b/src/BlockID.h similarity index 100% rename from source/BlockID.h rename to src/BlockID.h diff --git a/source/BlockTracer.h b/src/BlockTracer.h similarity index 100% rename from source/BlockTracer.h rename to src/BlockTracer.h diff --git a/source/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp similarity index 100% rename from source/Blocks/BlockBed.cpp rename to src/Blocks/BlockBed.cpp diff --git a/source/Blocks/BlockBed.h b/src/Blocks/BlockBed.h similarity index 100% rename from source/Blocks/BlockBed.h rename to src/Blocks/BlockBed.h diff --git a/source/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h similarity index 100% rename from source/Blocks/BlockBrewingStand.h rename to src/Blocks/BlockBrewingStand.h diff --git a/source/Blocks/BlockButton.cpp b/src/Blocks/BlockButton.cpp similarity index 100% rename from source/Blocks/BlockButton.cpp rename to src/Blocks/BlockButton.cpp diff --git a/source/Blocks/BlockButton.h b/src/Blocks/BlockButton.h similarity index 100% rename from source/Blocks/BlockButton.h rename to src/Blocks/BlockButton.h diff --git a/source/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h similarity index 100% rename from source/Blocks/BlockCactus.h rename to src/Blocks/BlockCactus.h diff --git a/source/Blocks/BlockCarpet.h b/src/Blocks/BlockCarpet.h similarity index 100% rename from source/Blocks/BlockCarpet.h rename to src/Blocks/BlockCarpet.h diff --git a/source/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h similarity index 100% rename from source/Blocks/BlockCauldron.h rename to src/Blocks/BlockCauldron.h diff --git a/source/Blocks/BlockChest.h b/src/Blocks/BlockChest.h similarity index 100% rename from source/Blocks/BlockChest.h rename to src/Blocks/BlockChest.h diff --git a/source/Blocks/BlockCloth.h b/src/Blocks/BlockCloth.h similarity index 100% rename from source/Blocks/BlockCloth.h rename to src/Blocks/BlockCloth.h diff --git a/source/Blocks/BlockCobWeb.h b/src/Blocks/BlockCobWeb.h similarity index 100% rename from source/Blocks/BlockCobWeb.h rename to src/Blocks/BlockCobWeb.h diff --git a/source/Blocks/BlockComparator.cpp b/src/Blocks/BlockComparator.cpp similarity index 100% rename from source/Blocks/BlockComparator.cpp rename to src/Blocks/BlockComparator.cpp diff --git a/source/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h similarity index 100% rename from source/Blocks/BlockComparator.h rename to src/Blocks/BlockComparator.h diff --git a/source/Blocks/BlockCrops.h b/src/Blocks/BlockCrops.h similarity index 100% rename from source/Blocks/BlockCrops.h rename to src/Blocks/BlockCrops.h diff --git a/source/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h similarity index 100% rename from source/Blocks/BlockDeadBush.h rename to src/Blocks/BlockDeadBush.h diff --git a/source/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h similarity index 100% rename from source/Blocks/BlockDirt.h rename to src/Blocks/BlockDirt.h diff --git a/source/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp similarity index 100% rename from source/Blocks/BlockDoor.cpp rename to src/Blocks/BlockDoor.cpp diff --git a/source/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h similarity index 100% rename from source/Blocks/BlockDoor.h rename to src/Blocks/BlockDoor.h diff --git a/source/Blocks/BlockDropSpenser.h b/src/Blocks/BlockDropSpenser.h similarity index 100% rename from source/Blocks/BlockDropSpenser.h rename to src/Blocks/BlockDropSpenser.h diff --git a/source/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h similarity index 100% rename from source/Blocks/BlockEnderchest.h rename to src/Blocks/BlockEnderchest.h diff --git a/source/Blocks/BlockEntity.h b/src/Blocks/BlockEntity.h similarity index 100% rename from source/Blocks/BlockEntity.h rename to src/Blocks/BlockEntity.h diff --git a/source/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h similarity index 100% rename from source/Blocks/BlockFarmland.h rename to src/Blocks/BlockFarmland.h diff --git a/source/Blocks/BlockFenceGate.h b/src/Blocks/BlockFenceGate.h similarity index 100% rename from source/Blocks/BlockFenceGate.h rename to src/Blocks/BlockFenceGate.h diff --git a/source/Blocks/BlockFire.h b/src/Blocks/BlockFire.h similarity index 100% rename from source/Blocks/BlockFire.h rename to src/Blocks/BlockFire.h diff --git a/source/Blocks/BlockFlower.h b/src/Blocks/BlockFlower.h similarity index 100% rename from source/Blocks/BlockFlower.h rename to src/Blocks/BlockFlower.h diff --git a/source/Blocks/BlockFlowerPot.h b/src/Blocks/BlockFlowerPot.h similarity index 100% rename from source/Blocks/BlockFlowerPot.h rename to src/Blocks/BlockFlowerPot.h diff --git a/source/Blocks/BlockFluid.h b/src/Blocks/BlockFluid.h similarity index 100% rename from source/Blocks/BlockFluid.h rename to src/Blocks/BlockFluid.h diff --git a/source/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h similarity index 100% rename from source/Blocks/BlockFurnace.h rename to src/Blocks/BlockFurnace.h diff --git a/source/Blocks/BlockGlass.h b/src/Blocks/BlockGlass.h similarity index 100% rename from source/Blocks/BlockGlass.h rename to src/Blocks/BlockGlass.h diff --git a/source/Blocks/BlockGlowstone.h b/src/Blocks/BlockGlowstone.h similarity index 100% rename from source/Blocks/BlockGlowstone.h rename to src/Blocks/BlockGlowstone.h diff --git a/source/Blocks/BlockGravel.h b/src/Blocks/BlockGravel.h similarity index 100% rename from source/Blocks/BlockGravel.h rename to src/Blocks/BlockGravel.h diff --git a/source/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp similarity index 100% rename from source/Blocks/BlockHandler.cpp rename to src/Blocks/BlockHandler.cpp diff --git a/source/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h similarity index 100% rename from source/Blocks/BlockHandler.h rename to src/Blocks/BlockHandler.h diff --git a/source/Blocks/BlockHopper.h b/src/Blocks/BlockHopper.h similarity index 100% rename from source/Blocks/BlockHopper.h rename to src/Blocks/BlockHopper.h diff --git a/source/Blocks/BlockIce.h b/src/Blocks/BlockIce.h similarity index 100% rename from source/Blocks/BlockIce.h rename to src/Blocks/BlockIce.h diff --git a/source/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h similarity index 100% rename from source/Blocks/BlockLadder.h rename to src/Blocks/BlockLadder.h diff --git a/source/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h similarity index 100% rename from source/Blocks/BlockLeaves.h rename to src/Blocks/BlockLeaves.h diff --git a/source/Blocks/BlockLever.cpp b/src/Blocks/BlockLever.cpp similarity index 100% rename from source/Blocks/BlockLever.cpp rename to src/Blocks/BlockLever.cpp diff --git a/source/Blocks/BlockLever.h b/src/Blocks/BlockLever.h similarity index 100% rename from source/Blocks/BlockLever.h rename to src/Blocks/BlockLever.h diff --git a/source/Blocks/BlockMelon.h b/src/Blocks/BlockMelon.h similarity index 100% rename from source/Blocks/BlockMelon.h rename to src/Blocks/BlockMelon.h diff --git a/source/Blocks/BlockMushroom.h b/src/Blocks/BlockMushroom.h similarity index 100% rename from source/Blocks/BlockMushroom.h rename to src/Blocks/BlockMushroom.h diff --git a/source/Blocks/BlockMycelium.h b/src/Blocks/BlockMycelium.h similarity index 100% rename from source/Blocks/BlockMycelium.h rename to src/Blocks/BlockMycelium.h diff --git a/source/Blocks/BlockNote.h b/src/Blocks/BlockNote.h similarity index 100% rename from source/Blocks/BlockNote.h rename to src/Blocks/BlockNote.h diff --git a/source/Blocks/BlockOre.h b/src/Blocks/BlockOre.h similarity index 100% rename from source/Blocks/BlockOre.h rename to src/Blocks/BlockOre.h diff --git a/source/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp similarity index 100% rename from source/Blocks/BlockPiston.cpp rename to src/Blocks/BlockPiston.cpp diff --git a/source/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h similarity index 100% rename from source/Blocks/BlockPiston.h rename to src/Blocks/BlockPiston.h diff --git a/source/Blocks/BlockPlanks.h b/src/Blocks/BlockPlanks.h similarity index 100% rename from source/Blocks/BlockPlanks.h rename to src/Blocks/BlockPlanks.h diff --git a/source/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h similarity index 100% rename from source/Blocks/BlockPortal.h rename to src/Blocks/BlockPortal.h diff --git a/source/Blocks/BlockPumpkin.h b/src/Blocks/BlockPumpkin.h similarity index 100% rename from source/Blocks/BlockPumpkin.h rename to src/Blocks/BlockPumpkin.h diff --git a/source/Blocks/BlockRail.h b/src/Blocks/BlockRail.h similarity index 100% rename from source/Blocks/BlockRail.h rename to src/Blocks/BlockRail.h diff --git a/source/Blocks/BlockRedstone.cpp b/src/Blocks/BlockRedstone.cpp similarity index 100% rename from source/Blocks/BlockRedstone.cpp rename to src/Blocks/BlockRedstone.cpp diff --git a/source/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstone.h similarity index 100% rename from source/Blocks/BlockRedstone.h rename to src/Blocks/BlockRedstone.h diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/src/Blocks/BlockRedstoneRepeater.cpp similarity index 100% rename from source/Blocks/BlockRedstoneRepeater.cpp rename to src/Blocks/BlockRedstoneRepeater.cpp diff --git a/source/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h similarity index 100% rename from source/Blocks/BlockRedstoneRepeater.h rename to src/Blocks/BlockRedstoneRepeater.h diff --git a/source/Blocks/BlockRedstoneTorch.h b/src/Blocks/BlockRedstoneTorch.h similarity index 100% rename from source/Blocks/BlockRedstoneTorch.h rename to src/Blocks/BlockRedstoneTorch.h diff --git a/source/Blocks/BlockSand.h b/src/Blocks/BlockSand.h similarity index 100% rename from source/Blocks/BlockSand.h rename to src/Blocks/BlockSand.h diff --git a/source/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h similarity index 100% rename from source/Blocks/BlockSapling.h rename to src/Blocks/BlockSapling.h diff --git a/source/Blocks/BlockSign.h b/src/Blocks/BlockSign.h similarity index 100% rename from source/Blocks/BlockSign.h rename to src/Blocks/BlockSign.h diff --git a/source/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h similarity index 100% rename from source/Blocks/BlockSlab.h rename to src/Blocks/BlockSlab.h diff --git a/source/Blocks/BlockSnow.h b/src/Blocks/BlockSnow.h similarity index 100% rename from source/Blocks/BlockSnow.h rename to src/Blocks/BlockSnow.h diff --git a/source/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h similarity index 100% rename from source/Blocks/BlockStairs.h rename to src/Blocks/BlockStairs.h diff --git a/source/Blocks/BlockStems.h b/src/Blocks/BlockStems.h similarity index 100% rename from source/Blocks/BlockStems.h rename to src/Blocks/BlockStems.h diff --git a/source/Blocks/BlockStone.h b/src/Blocks/BlockStone.h similarity index 100% rename from source/Blocks/BlockStone.h rename to src/Blocks/BlockStone.h diff --git a/source/Blocks/BlockSugarcane.h b/src/Blocks/BlockSugarcane.h similarity index 100% rename from source/Blocks/BlockSugarcane.h rename to src/Blocks/BlockSugarcane.h diff --git a/source/Blocks/BlockTallGrass.h b/src/Blocks/BlockTallGrass.h similarity index 100% rename from source/Blocks/BlockTallGrass.h rename to src/Blocks/BlockTallGrass.h diff --git a/source/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h similarity index 100% rename from source/Blocks/BlockTorch.h rename to src/Blocks/BlockTorch.h diff --git a/source/Blocks/BlockVine.h b/src/Blocks/BlockVine.h similarity index 100% rename from source/Blocks/BlockVine.h rename to src/Blocks/BlockVine.h diff --git a/source/Blocks/BlockWood.h b/src/Blocks/BlockWood.h similarity index 100% rename from source/Blocks/BlockWood.h rename to src/Blocks/BlockWood.h diff --git a/source/Blocks/BlockWorkbench.h b/src/Blocks/BlockWorkbench.h similarity index 100% rename from source/Blocks/BlockWorkbench.h rename to src/Blocks/BlockWorkbench.h diff --git a/source/BoundingBox.cpp b/src/BoundingBox.cpp similarity index 100% rename from source/BoundingBox.cpp rename to src/BoundingBox.cpp diff --git a/source/BoundingBox.h b/src/BoundingBox.h similarity index 100% rename from source/BoundingBox.h rename to src/BoundingBox.h diff --git a/source/ByteBuffer.cpp b/src/ByteBuffer.cpp similarity index 100% rename from source/ByteBuffer.cpp rename to src/ByteBuffer.cpp diff --git a/source/ByteBuffer.h b/src/ByteBuffer.h similarity index 100% rename from source/ByteBuffer.h rename to src/ByteBuffer.h diff --git a/source/ChatColor.cpp b/src/ChatColor.cpp similarity index 100% rename from source/ChatColor.cpp rename to src/ChatColor.cpp diff --git a/source/ChatColor.h b/src/ChatColor.h similarity index 100% rename from source/ChatColor.h rename to src/ChatColor.h diff --git a/source/Chunk.cpp b/src/Chunk.cpp similarity index 99% rename from source/Chunk.cpp rename to src/Chunk.cpp index 7e71e9ea7..b3b24e339 100644 --- a/source/Chunk.cpp +++ b/src/Chunk.cpp @@ -10,7 +10,7 @@ #include "World.h" #include "ClientHandle.h" #include "Server.h" -#include "zlib.h" +#include "zlib/zlib.h" #include "Defines.h" #include "BlockEntities/ChestEntity.h" #include "BlockEntities/DispenserEntity.h" @@ -34,7 +34,7 @@ #include "MobSpawner.h" -#include +#include "json/json.h" diff --git a/source/Chunk.h b/src/Chunk.h similarity index 100% rename from source/Chunk.h rename to src/Chunk.h diff --git a/source/Chunk.inl.h b/src/Chunk.inl.h similarity index 100% rename from source/Chunk.inl.h rename to src/Chunk.inl.h diff --git a/source/ChunkDef.h b/src/ChunkDef.h similarity index 100% rename from source/ChunkDef.h rename to src/ChunkDef.h diff --git a/source/ChunkMap.cpp b/src/ChunkMap.cpp similarity index 99% rename from source/ChunkMap.cpp rename to src/ChunkMap.cpp index 9d55917e5..611e9f24e 100644 --- a/source/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -20,8 +20,8 @@ #include // abs #endif -#include "zlib.h" -#include +#include "zlib/zlib.h" +#include "json/json.h" diff --git a/source/ChunkMap.h b/src/ChunkMap.h similarity index 100% rename from source/ChunkMap.h rename to src/ChunkMap.h diff --git a/source/ChunkSender.cpp b/src/ChunkSender.cpp similarity index 100% rename from source/ChunkSender.cpp rename to src/ChunkSender.cpp diff --git a/source/ChunkSender.h b/src/ChunkSender.h similarity index 100% rename from source/ChunkSender.h rename to src/ChunkSender.h diff --git a/source/ClientHandle.cpp b/src/ClientHandle.cpp similarity index 100% rename from source/ClientHandle.cpp rename to src/ClientHandle.cpp diff --git a/source/ClientHandle.h b/src/ClientHandle.h similarity index 100% rename from source/ClientHandle.h rename to src/ClientHandle.h diff --git a/source/CommandOutput.cpp b/src/CommandOutput.cpp similarity index 100% rename from source/CommandOutput.cpp rename to src/CommandOutput.cpp diff --git a/source/CommandOutput.h b/src/CommandOutput.h similarity index 100% rename from source/CommandOutput.h rename to src/CommandOutput.h diff --git a/source/CraftingRecipes.cpp b/src/CraftingRecipes.cpp similarity index 100% rename from source/CraftingRecipes.cpp rename to src/CraftingRecipes.cpp diff --git a/source/CraftingRecipes.h b/src/CraftingRecipes.h similarity index 100% rename from source/CraftingRecipes.h rename to src/CraftingRecipes.h diff --git a/source/Cuboid.cpp b/src/Cuboid.cpp similarity index 100% rename from source/Cuboid.cpp rename to src/Cuboid.cpp diff --git a/source/Cuboid.h b/src/Cuboid.h similarity index 100% rename from source/Cuboid.h rename to src/Cuboid.h diff --git a/source/DeadlockDetect.cpp b/src/DeadlockDetect.cpp similarity index 100% rename from source/DeadlockDetect.cpp rename to src/DeadlockDetect.cpp diff --git a/source/DeadlockDetect.h b/src/DeadlockDetect.h similarity index 100% rename from source/DeadlockDetect.h rename to src/DeadlockDetect.h diff --git a/source/Defines.h b/src/Defines.h similarity index 100% rename from source/Defines.h rename to src/Defines.h diff --git a/source/Enchantments.cpp b/src/Enchantments.cpp similarity index 100% rename from source/Enchantments.cpp rename to src/Enchantments.cpp diff --git a/source/Enchantments.h b/src/Enchantments.h similarity index 100% rename from source/Enchantments.h rename to src/Enchantments.h diff --git a/source/Endianness.h b/src/Endianness.h similarity index 100% rename from source/Endianness.h rename to src/Endianness.h diff --git a/source/Entities/Boat.cpp b/src/Entities/Boat.cpp similarity index 100% rename from source/Entities/Boat.cpp rename to src/Entities/Boat.cpp diff --git a/source/Entities/Boat.h b/src/Entities/Boat.h similarity index 100% rename from source/Entities/Boat.h rename to src/Entities/Boat.h diff --git a/source/Entities/Entity.cpp b/src/Entities/Entity.cpp similarity index 100% rename from source/Entities/Entity.cpp rename to src/Entities/Entity.cpp diff --git a/source/Entities/Entity.h b/src/Entities/Entity.h similarity index 100% rename from source/Entities/Entity.h rename to src/Entities/Entity.h diff --git a/source/Entities/ExpOrb.cpp b/src/Entities/ExpOrb.cpp similarity index 100% rename from source/Entities/ExpOrb.cpp rename to src/Entities/ExpOrb.cpp diff --git a/source/Entities/ExpOrb.h b/src/Entities/ExpOrb.h similarity index 100% rename from source/Entities/ExpOrb.h rename to src/Entities/ExpOrb.h diff --git a/source/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp similarity index 100% rename from source/Entities/FallingBlock.cpp rename to src/Entities/FallingBlock.cpp diff --git a/source/Entities/FallingBlock.h b/src/Entities/FallingBlock.h similarity index 100% rename from source/Entities/FallingBlock.h rename to src/Entities/FallingBlock.h diff --git a/source/Entities/Minecart.cpp b/src/Entities/Minecart.cpp similarity index 100% rename from source/Entities/Minecart.cpp rename to src/Entities/Minecart.cpp diff --git a/source/Entities/Minecart.h b/src/Entities/Minecart.h similarity index 100% rename from source/Entities/Minecart.h rename to src/Entities/Minecart.h diff --git a/source/Entities/Pawn.cpp b/src/Entities/Pawn.cpp similarity index 100% rename from source/Entities/Pawn.cpp rename to src/Entities/Pawn.cpp diff --git a/source/Entities/Pawn.h b/src/Entities/Pawn.h similarity index 100% rename from source/Entities/Pawn.h rename to src/Entities/Pawn.h diff --git a/source/Entities/Pickup.cpp b/src/Entities/Pickup.cpp similarity index 100% rename from source/Entities/Pickup.cpp rename to src/Entities/Pickup.cpp diff --git a/source/Entities/Pickup.h b/src/Entities/Pickup.h similarity index 100% rename from source/Entities/Pickup.h rename to src/Entities/Pickup.h diff --git a/source/Entities/Player.cpp b/src/Entities/Player.cpp similarity index 99% rename from source/Entities/Player.cpp rename to src/Entities/Player.cpp index f37a23f22..910613e98 100644 --- a/source/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -24,8 +24,8 @@ #include "../Vector3d.h" #include "../Vector3f.h" -#include "../../iniFile/iniFile.h" -#include +#include "inifile/iniFile.h" +#include "json/json.h" #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x)) diff --git a/source/Entities/Player.h b/src/Entities/Player.h similarity index 100% rename from source/Entities/Player.h rename to src/Entities/Player.h diff --git a/source/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp similarity index 100% rename from source/Entities/ProjectileEntity.cpp rename to src/Entities/ProjectileEntity.cpp diff --git a/source/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h similarity index 100% rename from source/Entities/ProjectileEntity.h rename to src/Entities/ProjectileEntity.h diff --git a/source/Entities/TNTEntity.cpp b/src/Entities/TNTEntity.cpp similarity index 100% rename from source/Entities/TNTEntity.cpp rename to src/Entities/TNTEntity.cpp diff --git a/source/Entities/TNTEntity.h b/src/Entities/TNTEntity.h similarity index 100% rename from source/Entities/TNTEntity.h rename to src/Entities/TNTEntity.h diff --git a/source/FastRandom.cpp b/src/FastRandom.cpp similarity index 100% rename from source/FastRandom.cpp rename to src/FastRandom.cpp diff --git a/source/FastRandom.h b/src/FastRandom.h similarity index 100% rename from source/FastRandom.h rename to src/FastRandom.h diff --git a/source/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp similarity index 100% rename from source/FurnaceRecipe.cpp rename to src/FurnaceRecipe.cpp diff --git a/source/FurnaceRecipe.h b/src/FurnaceRecipe.h similarity index 100% rename from source/FurnaceRecipe.h rename to src/FurnaceRecipe.h diff --git a/source/Generating/BioGen.cpp b/src/Generating/BioGen.cpp similarity index 99% rename from source/Generating/BioGen.cpp rename to src/Generating/BioGen.cpp index 926120afc..1cd7c70e7 100644 --- a/source/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "BioGen.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/source/Generating/BioGen.h b/src/Generating/BioGen.h similarity index 100% rename from source/Generating/BioGen.h rename to src/Generating/BioGen.h diff --git a/source/Generating/Caves.cpp b/src/Generating/Caves.cpp similarity index 100% rename from source/Generating/Caves.cpp rename to src/Generating/Caves.cpp diff --git a/source/Generating/Caves.h b/src/Generating/Caves.h similarity index 100% rename from source/Generating/Caves.h rename to src/Generating/Caves.h diff --git a/source/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp similarity index 100% rename from source/Generating/ChunkDesc.cpp rename to src/Generating/ChunkDesc.cpp diff --git a/source/Generating/ChunkDesc.h b/src/Generating/ChunkDesc.h similarity index 100% rename from source/Generating/ChunkDesc.h rename to src/Generating/ChunkDesc.h diff --git a/source/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp similarity index 99% rename from source/Generating/ChunkGenerator.cpp rename to src/Generating/ChunkGenerator.cpp index 33c956eba..f28504441 100644 --- a/source/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -3,7 +3,7 @@ #include "ChunkGenerator.h" #include "../World.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../Root.h" #include "../PluginManager.h" #include "ChunkDesc.h" diff --git a/source/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h similarity index 100% rename from source/Generating/ChunkGenerator.h rename to src/Generating/ChunkGenerator.h diff --git a/source/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp similarity index 99% rename from source/Generating/CompoGen.cpp rename to src/Generating/CompoGen.cpp index cc2a203af..03a65a457 100644 --- a/source/Generating/CompoGen.cpp +++ b/src/Generating/CompoGen.cpp @@ -12,7 +12,7 @@ #include "../BlockID.h" #include "../Item.h" #include "../LinearUpscale.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/source/Generating/CompoGen.h b/src/Generating/CompoGen.h similarity index 100% rename from source/Generating/CompoGen.h rename to src/Generating/CompoGen.h diff --git a/source/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp similarity index 99% rename from source/Generating/ComposableGenerator.cpp rename to src/Generating/ComposableGenerator.cpp index 2637b64e7..01070963c 100644 --- a/source/Generating/ComposableGenerator.cpp +++ b/src/Generating/ComposableGenerator.cpp @@ -7,7 +7,7 @@ #include "ComposableGenerator.h" #include "../World.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../Root.h" // Individual composed algorithms: diff --git a/source/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h similarity index 100% rename from source/Generating/ComposableGenerator.h rename to src/Generating/ComposableGenerator.h diff --git a/source/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp similarity index 99% rename from source/Generating/DistortedHeightmap.cpp rename to src/Generating/DistortedHeightmap.cpp index 7e46c251e..95ea812fa 100644 --- a/source/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -7,7 +7,7 @@ #include "DistortedHeightmap.h" #include "../OSSupport/File.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/source/Generating/DistortedHeightmap.h b/src/Generating/DistortedHeightmap.h similarity index 100% rename from source/Generating/DistortedHeightmap.h rename to src/Generating/DistortedHeightmap.h diff --git a/source/Generating/EndGen.cpp b/src/Generating/EndGen.cpp similarity index 99% rename from source/Generating/EndGen.cpp rename to src/Generating/EndGen.cpp index 90a8071fa..1fa0fa121 100644 --- a/source/Generating/EndGen.cpp +++ b/src/Generating/EndGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "EndGen.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/source/Generating/EndGen.h b/src/Generating/EndGen.h similarity index 100% rename from source/Generating/EndGen.h rename to src/Generating/EndGen.h diff --git a/source/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp similarity index 100% rename from source/Generating/FinishGen.cpp rename to src/Generating/FinishGen.cpp diff --git a/source/Generating/FinishGen.h b/src/Generating/FinishGen.h similarity index 100% rename from source/Generating/FinishGen.h rename to src/Generating/FinishGen.h diff --git a/source/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp similarity index 99% rename from source/Generating/HeiGen.cpp rename to src/Generating/HeiGen.cpp index 5dee181b7..8aab3fe15 100644 --- a/source/Generating/HeiGen.cpp +++ b/src/Generating/HeiGen.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "HeiGen.h" #include "../LinearUpscale.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/source/Generating/HeiGen.h b/src/Generating/HeiGen.h similarity index 100% rename from source/Generating/HeiGen.h rename to src/Generating/HeiGen.h diff --git a/source/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp similarity index 100% rename from source/Generating/MineShafts.cpp rename to src/Generating/MineShafts.cpp diff --git a/source/Generating/MineShafts.h b/src/Generating/MineShafts.h similarity index 100% rename from source/Generating/MineShafts.h rename to src/Generating/MineShafts.h diff --git a/source/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp similarity index 99% rename from source/Generating/Noise3DGenerator.cpp rename to src/Generating/Noise3DGenerator.cpp index 03626a800..0c68957c0 100644 --- a/source/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "Noise3DGenerator.h" #include "../OSSupport/File.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/source/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h similarity index 100% rename from source/Generating/Noise3DGenerator.h rename to src/Generating/Noise3DGenerator.h diff --git a/source/Generating/Ravines.cpp b/src/Generating/Ravines.cpp similarity index 100% rename from source/Generating/Ravines.cpp rename to src/Generating/Ravines.cpp diff --git a/source/Generating/Ravines.h b/src/Generating/Ravines.h similarity index 100% rename from source/Generating/Ravines.h rename to src/Generating/Ravines.h diff --git a/source/Generating/StructGen.cpp b/src/Generating/StructGen.cpp similarity index 100% rename from source/Generating/StructGen.cpp rename to src/Generating/StructGen.cpp diff --git a/source/Generating/StructGen.h b/src/Generating/StructGen.h similarity index 100% rename from source/Generating/StructGen.h rename to src/Generating/StructGen.h diff --git a/source/Generating/Trees.cpp b/src/Generating/Trees.cpp similarity index 100% rename from source/Generating/Trees.cpp rename to src/Generating/Trees.cpp diff --git a/source/Generating/Trees.h b/src/Generating/Trees.h similarity index 100% rename from source/Generating/Trees.h rename to src/Generating/Trees.h diff --git a/source/Globals.cpp b/src/Globals.cpp similarity index 100% rename from source/Globals.cpp rename to src/Globals.cpp diff --git a/source/Globals.h b/src/Globals.h similarity index 100% rename from source/Globals.h rename to src/Globals.h diff --git a/source/Group.cpp b/src/Group.cpp similarity index 100% rename from source/Group.cpp rename to src/Group.cpp diff --git a/source/Group.h b/src/Group.h similarity index 100% rename from source/Group.h rename to src/Group.h diff --git a/source/GroupManager.cpp b/src/GroupManager.cpp similarity index 98% rename from source/GroupManager.cpp rename to src/GroupManager.cpp index d7332fd0a..df609f05b 100644 --- a/source/GroupManager.cpp +++ b/src/GroupManager.cpp @@ -2,7 +2,7 @@ #include "GroupManager.h" #include "Group.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "ChatColor.h" #include "Root.h" diff --git a/source/GroupManager.h b/src/GroupManager.h similarity index 100% rename from source/GroupManager.h rename to src/GroupManager.h diff --git a/source/HTTPServer/EnvelopeParser.cpp b/src/HTTPServer/EnvelopeParser.cpp similarity index 100% rename from source/HTTPServer/EnvelopeParser.cpp rename to src/HTTPServer/EnvelopeParser.cpp diff --git a/source/HTTPServer/EnvelopeParser.h b/src/HTTPServer/EnvelopeParser.h similarity index 100% rename from source/HTTPServer/EnvelopeParser.h rename to src/HTTPServer/EnvelopeParser.h diff --git a/source/HTTPServer/HTTPConnection.cpp b/src/HTTPServer/HTTPConnection.cpp similarity index 100% rename from source/HTTPServer/HTTPConnection.cpp rename to src/HTTPServer/HTTPConnection.cpp diff --git a/source/HTTPServer/HTTPConnection.h b/src/HTTPServer/HTTPConnection.h similarity index 100% rename from source/HTTPServer/HTTPConnection.h rename to src/HTTPServer/HTTPConnection.h diff --git a/source/HTTPServer/HTTPFormParser.cpp b/src/HTTPServer/HTTPFormParser.cpp similarity index 100% rename from source/HTTPServer/HTTPFormParser.cpp rename to src/HTTPServer/HTTPFormParser.cpp diff --git a/source/HTTPServer/HTTPFormParser.h b/src/HTTPServer/HTTPFormParser.h similarity index 100% rename from source/HTTPServer/HTTPFormParser.h rename to src/HTTPServer/HTTPFormParser.h diff --git a/source/HTTPServer/HTTPMessage.cpp b/src/HTTPServer/HTTPMessage.cpp similarity index 100% rename from source/HTTPServer/HTTPMessage.cpp rename to src/HTTPServer/HTTPMessage.cpp diff --git a/source/HTTPServer/HTTPMessage.h b/src/HTTPServer/HTTPMessage.h similarity index 100% rename from source/HTTPServer/HTTPMessage.h rename to src/HTTPServer/HTTPMessage.h diff --git a/source/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp similarity index 100% rename from source/HTTPServer/HTTPServer.cpp rename to src/HTTPServer/HTTPServer.cpp diff --git a/source/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h similarity index 98% rename from source/HTTPServer/HTTPServer.h rename to src/HTTPServer/HTTPServer.h index fea2a9029..24baf8c95 100644 --- a/source/HTTPServer/HTTPServer.h +++ b/src/HTTPServer/HTTPServer.h @@ -11,7 +11,7 @@ #include "../OSSupport/ListenThread.h" #include "../OSSupport/SocketThreads.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/source/HTTPServer/MultipartParser.cpp b/src/HTTPServer/MultipartParser.cpp similarity index 100% rename from source/HTTPServer/MultipartParser.cpp rename to src/HTTPServer/MultipartParser.cpp diff --git a/source/HTTPServer/MultipartParser.h b/src/HTTPServer/MultipartParser.h similarity index 100% rename from source/HTTPServer/MultipartParser.h rename to src/HTTPServer/MultipartParser.h diff --git a/source/HTTPServer/NameValueParser.cpp b/src/HTTPServer/NameValueParser.cpp similarity index 100% rename from source/HTTPServer/NameValueParser.cpp rename to src/HTTPServer/NameValueParser.cpp diff --git a/source/HTTPServer/NameValueParser.h b/src/HTTPServer/NameValueParser.h similarity index 100% rename from source/HTTPServer/NameValueParser.h rename to src/HTTPServer/NameValueParser.h diff --git a/source/Inventory.cpp b/src/Inventory.cpp similarity index 99% rename from source/Inventory.cpp rename to src/Inventory.cpp index 90b998358..a9b4ab9c5 100644 --- a/source/Inventory.cpp +++ b/src/Inventory.cpp @@ -9,7 +9,7 @@ #include "Root.h" #include "World.h" -#include +#include "json/json.h" #include "Items/ItemHandler.h" diff --git a/source/Inventory.h b/src/Inventory.h similarity index 100% rename from source/Inventory.h rename to src/Inventory.h diff --git a/source/Item.cpp b/src/Item.cpp similarity index 99% rename from source/Item.cpp rename to src/Item.cpp index 25664e4df..196a260ef 100644 --- a/source/Item.cpp +++ b/src/Item.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Item.h" -#include +#include "json/json.h" #include "Items/ItemHandler.h" diff --git a/source/Item.h b/src/Item.h similarity index 100% rename from source/Item.h rename to src/Item.h diff --git a/source/ItemGrid.cpp b/src/ItemGrid.cpp similarity index 100% rename from source/ItemGrid.cpp rename to src/ItemGrid.cpp diff --git a/source/ItemGrid.h b/src/ItemGrid.h similarity index 100% rename from source/ItemGrid.h rename to src/ItemGrid.h diff --git a/source/Items/ItemBed.h b/src/Items/ItemBed.h similarity index 100% rename from source/Items/ItemBed.h rename to src/Items/ItemBed.h diff --git a/source/Items/ItemBoat.h b/src/Items/ItemBoat.h similarity index 100% rename from source/Items/ItemBoat.h rename to src/Items/ItemBoat.h diff --git a/source/Items/ItemBow.h b/src/Items/ItemBow.h similarity index 100% rename from source/Items/ItemBow.h rename to src/Items/ItemBow.h diff --git a/source/Items/ItemBrewingStand.h b/src/Items/ItemBrewingStand.h similarity index 100% rename from source/Items/ItemBrewingStand.h rename to src/Items/ItemBrewingStand.h diff --git a/source/Items/ItemBucket.h b/src/Items/ItemBucket.h similarity index 100% rename from source/Items/ItemBucket.h rename to src/Items/ItemBucket.h diff --git a/source/Items/ItemCauldron.h b/src/Items/ItemCauldron.h similarity index 100% rename from source/Items/ItemCauldron.h rename to src/Items/ItemCauldron.h diff --git a/source/Items/ItemCloth.h b/src/Items/ItemCloth.h similarity index 100% rename from source/Items/ItemCloth.h rename to src/Items/ItemCloth.h diff --git a/source/Items/ItemComparator.h b/src/Items/ItemComparator.h similarity index 100% rename from source/Items/ItemComparator.h rename to src/Items/ItemComparator.h diff --git a/source/Items/ItemDoor.h b/src/Items/ItemDoor.h similarity index 100% rename from source/Items/ItemDoor.h rename to src/Items/ItemDoor.h diff --git a/source/Items/ItemDye.h b/src/Items/ItemDye.h similarity index 100% rename from source/Items/ItemDye.h rename to src/Items/ItemDye.h diff --git a/source/Items/ItemFlowerPot.h b/src/Items/ItemFlowerPot.h similarity index 100% rename from source/Items/ItemFlowerPot.h rename to src/Items/ItemFlowerPot.h diff --git a/source/Items/ItemFood.h b/src/Items/ItemFood.h similarity index 100% rename from source/Items/ItemFood.h rename to src/Items/ItemFood.h diff --git a/source/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp similarity index 100% rename from source/Items/ItemHandler.cpp rename to src/Items/ItemHandler.cpp diff --git a/source/Items/ItemHandler.h b/src/Items/ItemHandler.h similarity index 100% rename from source/Items/ItemHandler.h rename to src/Items/ItemHandler.h diff --git a/source/Items/ItemHoe.h b/src/Items/ItemHoe.h similarity index 100% rename from source/Items/ItemHoe.h rename to src/Items/ItemHoe.h diff --git a/source/Items/ItemLeaves.h b/src/Items/ItemLeaves.h similarity index 100% rename from source/Items/ItemLeaves.h rename to src/Items/ItemLeaves.h diff --git a/source/Items/ItemLighter.h b/src/Items/ItemLighter.h similarity index 100% rename from source/Items/ItemLighter.h rename to src/Items/ItemLighter.h diff --git a/source/Items/ItemMinecart.h b/src/Items/ItemMinecart.h similarity index 100% rename from source/Items/ItemMinecart.h rename to src/Items/ItemMinecart.h diff --git a/source/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h similarity index 100% rename from source/Items/ItemPickaxe.h rename to src/Items/ItemPickaxe.h diff --git a/source/Items/ItemRedstoneDust.h b/src/Items/ItemRedstoneDust.h similarity index 100% rename from source/Items/ItemRedstoneDust.h rename to src/Items/ItemRedstoneDust.h diff --git a/source/Items/ItemRedstoneRepeater.h b/src/Items/ItemRedstoneRepeater.h similarity index 100% rename from source/Items/ItemRedstoneRepeater.h rename to src/Items/ItemRedstoneRepeater.h diff --git a/source/Items/ItemSapling.h b/src/Items/ItemSapling.h similarity index 100% rename from source/Items/ItemSapling.h rename to src/Items/ItemSapling.h diff --git a/source/Items/ItemSeeds.h b/src/Items/ItemSeeds.h similarity index 100% rename from source/Items/ItemSeeds.h rename to src/Items/ItemSeeds.h diff --git a/source/Items/ItemShears.h b/src/Items/ItemShears.h similarity index 100% rename from source/Items/ItemShears.h rename to src/Items/ItemShears.h diff --git a/source/Items/ItemShovel.h b/src/Items/ItemShovel.h similarity index 100% rename from source/Items/ItemShovel.h rename to src/Items/ItemShovel.h diff --git a/source/Items/ItemSign.h b/src/Items/ItemSign.h similarity index 100% rename from source/Items/ItemSign.h rename to src/Items/ItemSign.h diff --git a/source/Items/ItemSpawnEgg.h b/src/Items/ItemSpawnEgg.h similarity index 100% rename from source/Items/ItemSpawnEgg.h rename to src/Items/ItemSpawnEgg.h diff --git a/source/Items/ItemSugarcane.h b/src/Items/ItemSugarcane.h similarity index 100% rename from source/Items/ItemSugarcane.h rename to src/Items/ItemSugarcane.h diff --git a/source/Items/ItemSword.h b/src/Items/ItemSword.h similarity index 100% rename from source/Items/ItemSword.h rename to src/Items/ItemSword.h diff --git a/source/Items/ItemThrowable.h b/src/Items/ItemThrowable.h similarity index 100% rename from source/Items/ItemThrowable.h rename to src/Items/ItemThrowable.h diff --git a/source/LeakFinder.cpp b/src/LeakFinder.cpp similarity index 100% rename from source/LeakFinder.cpp rename to src/LeakFinder.cpp diff --git a/source/LeakFinder.h b/src/LeakFinder.h similarity index 100% rename from source/LeakFinder.h rename to src/LeakFinder.h diff --git a/source/LightingThread.cpp b/src/LightingThread.cpp similarity index 100% rename from source/LightingThread.cpp rename to src/LightingThread.cpp diff --git a/source/LightingThread.h b/src/LightingThread.h similarity index 100% rename from source/LightingThread.h rename to src/LightingThread.h diff --git a/source/LineBlockTracer.cpp b/src/LineBlockTracer.cpp similarity index 100% rename from source/LineBlockTracer.cpp rename to src/LineBlockTracer.cpp diff --git a/source/LineBlockTracer.h b/src/LineBlockTracer.h similarity index 100% rename from source/LineBlockTracer.h rename to src/LineBlockTracer.h diff --git a/source/LinearInterpolation.cpp b/src/LinearInterpolation.cpp similarity index 100% rename from source/LinearInterpolation.cpp rename to src/LinearInterpolation.cpp diff --git a/source/LinearInterpolation.h b/src/LinearInterpolation.h similarity index 100% rename from source/LinearInterpolation.h rename to src/LinearInterpolation.h diff --git a/source/LinearUpscale.h b/src/LinearUpscale.h similarity index 100% rename from source/LinearUpscale.h rename to src/LinearUpscale.h diff --git a/source/Log.cpp b/src/Log.cpp similarity index 100% rename from source/Log.cpp rename to src/Log.cpp diff --git a/source/Log.h b/src/Log.h similarity index 100% rename from source/Log.h rename to src/Log.h diff --git a/source/LuaFunctions.h b/src/LuaFunctions.h similarity index 100% rename from source/LuaFunctions.h rename to src/LuaFunctions.h diff --git a/source/LuaState.cpp b/src/LuaState.cpp similarity index 99% rename from source/LuaState.cpp rename to src/LuaState.cpp index 644f4972c..6be1ee58c 100644 --- a/source/LuaState.cpp +++ b/src/LuaState.cpp @@ -8,7 +8,7 @@ extern "C" { - #include "lualib.h" + #include "lua/src/lualib.h" } #include "tolua++.h" diff --git a/source/LuaState.h b/src/LuaState.h similarity index 99% rename from source/LuaState.h rename to src/LuaState.h index aa71ee226..5e7f3d180 100644 --- a/source/LuaState.h +++ b/src/LuaState.h @@ -26,7 +26,7 @@ automatic resource management. extern "C" { - #include "lauxlib.h" + #include "lua/src/lauxlib.h" } diff --git a/source/LuaWindow.cpp b/src/LuaWindow.cpp similarity index 98% rename from source/LuaWindow.cpp rename to src/LuaWindow.cpp index 9011d668c..5f112f1e1 100644 --- a/source/LuaWindow.cpp +++ b/src/LuaWindow.cpp @@ -8,7 +8,7 @@ #include "UI/SlotArea.h" #include "PluginLua.h" #include "Entities/Player.h" -#include "lauxlib.h" // Needed for LUA_REFNIL +#include "lua/src/lauxlib.h" // Needed for LUA_REFNIL diff --git a/source/LuaWindow.h b/src/LuaWindow.h similarity index 100% rename from source/LuaWindow.h rename to src/LuaWindow.h diff --git a/source/MCLogger.cpp b/src/MCLogger.cpp similarity index 100% rename from source/MCLogger.cpp rename to src/MCLogger.cpp diff --git a/source/MCLogger.h b/src/MCLogger.h similarity index 100% rename from source/MCLogger.h rename to src/MCLogger.h diff --git a/source/ManualBindings.cpp b/src/ManualBindings.cpp similarity index 100% rename from source/ManualBindings.cpp rename to src/ManualBindings.cpp diff --git a/source/ManualBindings.h b/src/ManualBindings.h similarity index 100% rename from source/ManualBindings.h rename to src/ManualBindings.h diff --git a/source/Matrix4f.cpp b/src/Matrix4f.cpp similarity index 100% rename from source/Matrix4f.cpp rename to src/Matrix4f.cpp diff --git a/source/Matrix4f.h b/src/Matrix4f.h similarity index 100% rename from source/Matrix4f.h rename to src/Matrix4f.h diff --git a/source/MemoryLeak.h b/src/MemoryLeak.h similarity index 100% rename from source/MemoryLeak.h rename to src/MemoryLeak.h diff --git a/source/MersenneTwister.h b/src/MersenneTwister.h similarity index 100% rename from source/MersenneTwister.h rename to src/MersenneTwister.h diff --git a/source/MobCensus.cpp b/src/MobCensus.cpp similarity index 100% rename from source/MobCensus.cpp rename to src/MobCensus.cpp diff --git a/source/MobCensus.h b/src/MobCensus.h similarity index 100% rename from source/MobCensus.h rename to src/MobCensus.h diff --git a/source/MobFamilyCollecter.cpp b/src/MobFamilyCollecter.cpp similarity index 100% rename from source/MobFamilyCollecter.cpp rename to src/MobFamilyCollecter.cpp diff --git a/source/MobFamilyCollecter.h b/src/MobFamilyCollecter.h similarity index 100% rename from source/MobFamilyCollecter.h rename to src/MobFamilyCollecter.h diff --git a/source/MobProximityCounter.cpp b/src/MobProximityCounter.cpp similarity index 100% rename from source/MobProximityCounter.cpp rename to src/MobProximityCounter.cpp diff --git a/source/MobProximityCounter.h b/src/MobProximityCounter.h similarity index 100% rename from source/MobProximityCounter.h rename to src/MobProximityCounter.h diff --git a/source/MobSpawner.cpp b/src/MobSpawner.cpp similarity index 100% rename from source/MobSpawner.cpp rename to src/MobSpawner.cpp diff --git a/source/MobSpawner.h b/src/MobSpawner.h similarity index 100% rename from source/MobSpawner.h rename to src/MobSpawner.h diff --git a/source/Mobs/AggressiveMonster.cpp b/src/Mobs/AggressiveMonster.cpp similarity index 100% rename from source/Mobs/AggressiveMonster.cpp rename to src/Mobs/AggressiveMonster.cpp diff --git a/source/Mobs/AggressiveMonster.h b/src/Mobs/AggressiveMonster.h similarity index 100% rename from source/Mobs/AggressiveMonster.h rename to src/Mobs/AggressiveMonster.h diff --git a/source/Mobs/Bat.cpp b/src/Mobs/Bat.cpp similarity index 100% rename from source/Mobs/Bat.cpp rename to src/Mobs/Bat.cpp diff --git a/source/Mobs/Bat.h b/src/Mobs/Bat.h similarity index 100% rename from source/Mobs/Bat.h rename to src/Mobs/Bat.h diff --git a/source/Mobs/Blaze.cpp b/src/Mobs/Blaze.cpp similarity index 100% rename from source/Mobs/Blaze.cpp rename to src/Mobs/Blaze.cpp diff --git a/source/Mobs/Blaze.h b/src/Mobs/Blaze.h similarity index 100% rename from source/Mobs/Blaze.h rename to src/Mobs/Blaze.h diff --git a/source/Mobs/Cavespider.cpp b/src/Mobs/Cavespider.cpp similarity index 100% rename from source/Mobs/Cavespider.cpp rename to src/Mobs/Cavespider.cpp diff --git a/source/Mobs/Cavespider.h b/src/Mobs/Cavespider.h similarity index 100% rename from source/Mobs/Cavespider.h rename to src/Mobs/Cavespider.h diff --git a/source/Mobs/Chicken.cpp b/src/Mobs/Chicken.cpp similarity index 100% rename from source/Mobs/Chicken.cpp rename to src/Mobs/Chicken.cpp diff --git a/source/Mobs/Chicken.h b/src/Mobs/Chicken.h similarity index 100% rename from source/Mobs/Chicken.h rename to src/Mobs/Chicken.h diff --git a/source/Mobs/Cow.cpp b/src/Mobs/Cow.cpp similarity index 100% rename from source/Mobs/Cow.cpp rename to src/Mobs/Cow.cpp diff --git a/source/Mobs/Cow.h b/src/Mobs/Cow.h similarity index 100% rename from source/Mobs/Cow.h rename to src/Mobs/Cow.h diff --git a/source/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp similarity index 100% rename from source/Mobs/Creeper.cpp rename to src/Mobs/Creeper.cpp diff --git a/source/Mobs/Creeper.h b/src/Mobs/Creeper.h similarity index 100% rename from source/Mobs/Creeper.h rename to src/Mobs/Creeper.h diff --git a/source/Mobs/EnderDragon.cpp b/src/Mobs/EnderDragon.cpp similarity index 100% rename from source/Mobs/EnderDragon.cpp rename to src/Mobs/EnderDragon.cpp diff --git a/source/Mobs/EnderDragon.h b/src/Mobs/EnderDragon.h similarity index 100% rename from source/Mobs/EnderDragon.h rename to src/Mobs/EnderDragon.h diff --git a/source/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp similarity index 100% rename from source/Mobs/Enderman.cpp rename to src/Mobs/Enderman.cpp diff --git a/source/Mobs/Enderman.h b/src/Mobs/Enderman.h similarity index 100% rename from source/Mobs/Enderman.h rename to src/Mobs/Enderman.h diff --git a/source/Mobs/Ghast.cpp b/src/Mobs/Ghast.cpp similarity index 100% rename from source/Mobs/Ghast.cpp rename to src/Mobs/Ghast.cpp diff --git a/source/Mobs/Ghast.h b/src/Mobs/Ghast.h similarity index 100% rename from source/Mobs/Ghast.h rename to src/Mobs/Ghast.h diff --git a/source/Mobs/Giant.cpp b/src/Mobs/Giant.cpp similarity index 100% rename from source/Mobs/Giant.cpp rename to src/Mobs/Giant.cpp diff --git a/source/Mobs/Giant.h b/src/Mobs/Giant.h similarity index 100% rename from source/Mobs/Giant.h rename to src/Mobs/Giant.h diff --git a/source/Mobs/Horse.cpp b/src/Mobs/Horse.cpp similarity index 100% rename from source/Mobs/Horse.cpp rename to src/Mobs/Horse.cpp diff --git a/source/Mobs/Horse.h b/src/Mobs/Horse.h similarity index 100% rename from source/Mobs/Horse.h rename to src/Mobs/Horse.h diff --git a/source/Mobs/IncludeAllMonsters.h b/src/Mobs/IncludeAllMonsters.h similarity index 100% rename from source/Mobs/IncludeAllMonsters.h rename to src/Mobs/IncludeAllMonsters.h diff --git a/source/Mobs/IronGolem.cpp b/src/Mobs/IronGolem.cpp similarity index 100% rename from source/Mobs/IronGolem.cpp rename to src/Mobs/IronGolem.cpp diff --git a/source/Mobs/IronGolem.h b/src/Mobs/IronGolem.h similarity index 100% rename from source/Mobs/IronGolem.h rename to src/Mobs/IronGolem.h diff --git a/source/Mobs/Magmacube.cpp b/src/Mobs/Magmacube.cpp similarity index 100% rename from source/Mobs/Magmacube.cpp rename to src/Mobs/Magmacube.cpp diff --git a/source/Mobs/Magmacube.h b/src/Mobs/Magmacube.h similarity index 100% rename from source/Mobs/Magmacube.h rename to src/Mobs/Magmacube.h diff --git a/source/Mobs/Monster.cpp b/src/Mobs/Monster.cpp similarity index 100% rename from source/Mobs/Monster.cpp rename to src/Mobs/Monster.cpp diff --git a/source/Mobs/Monster.h b/src/Mobs/Monster.h similarity index 100% rename from source/Mobs/Monster.h rename to src/Mobs/Monster.h diff --git a/source/Mobs/Mooshroom.cpp b/src/Mobs/Mooshroom.cpp similarity index 100% rename from source/Mobs/Mooshroom.cpp rename to src/Mobs/Mooshroom.cpp diff --git a/source/Mobs/Mooshroom.h b/src/Mobs/Mooshroom.h similarity index 100% rename from source/Mobs/Mooshroom.h rename to src/Mobs/Mooshroom.h diff --git a/source/Mobs/Ocelot.h b/src/Mobs/Ocelot.h similarity index 100% rename from source/Mobs/Ocelot.h rename to src/Mobs/Ocelot.h diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/src/Mobs/PassiveAggressiveMonster.cpp similarity index 100% rename from source/Mobs/PassiveAggressiveMonster.cpp rename to src/Mobs/PassiveAggressiveMonster.cpp diff --git a/source/Mobs/PassiveAggressiveMonster.h b/src/Mobs/PassiveAggressiveMonster.h similarity index 100% rename from source/Mobs/PassiveAggressiveMonster.h rename to src/Mobs/PassiveAggressiveMonster.h diff --git a/source/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp similarity index 100% rename from source/Mobs/PassiveMonster.cpp rename to src/Mobs/PassiveMonster.cpp diff --git a/source/Mobs/PassiveMonster.h b/src/Mobs/PassiveMonster.h similarity index 100% rename from source/Mobs/PassiveMonster.h rename to src/Mobs/PassiveMonster.h diff --git a/source/Mobs/Pig.cpp b/src/Mobs/Pig.cpp similarity index 100% rename from source/Mobs/Pig.cpp rename to src/Mobs/Pig.cpp diff --git a/source/Mobs/Pig.h b/src/Mobs/Pig.h similarity index 100% rename from source/Mobs/Pig.h rename to src/Mobs/Pig.h diff --git a/source/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp similarity index 100% rename from source/Mobs/Sheep.cpp rename to src/Mobs/Sheep.cpp diff --git a/source/Mobs/Sheep.h b/src/Mobs/Sheep.h similarity index 100% rename from source/Mobs/Sheep.h rename to src/Mobs/Sheep.h diff --git a/source/Mobs/Silverfish.h b/src/Mobs/Silverfish.h similarity index 100% rename from source/Mobs/Silverfish.h rename to src/Mobs/Silverfish.h diff --git a/source/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp similarity index 100% rename from source/Mobs/Skeleton.cpp rename to src/Mobs/Skeleton.cpp diff --git a/source/Mobs/Skeleton.h b/src/Mobs/Skeleton.h similarity index 100% rename from source/Mobs/Skeleton.h rename to src/Mobs/Skeleton.h diff --git a/source/Mobs/Slime.cpp b/src/Mobs/Slime.cpp similarity index 100% rename from source/Mobs/Slime.cpp rename to src/Mobs/Slime.cpp diff --git a/source/Mobs/Slime.h b/src/Mobs/Slime.h similarity index 100% rename from source/Mobs/Slime.h rename to src/Mobs/Slime.h diff --git a/source/Mobs/SnowGolem.cpp b/src/Mobs/SnowGolem.cpp similarity index 100% rename from source/Mobs/SnowGolem.cpp rename to src/Mobs/SnowGolem.cpp diff --git a/source/Mobs/SnowGolem.h b/src/Mobs/SnowGolem.h similarity index 100% rename from source/Mobs/SnowGolem.h rename to src/Mobs/SnowGolem.h diff --git a/source/Mobs/Spider.cpp b/src/Mobs/Spider.cpp similarity index 100% rename from source/Mobs/Spider.cpp rename to src/Mobs/Spider.cpp diff --git a/source/Mobs/Spider.h b/src/Mobs/Spider.h similarity index 100% rename from source/Mobs/Spider.h rename to src/Mobs/Spider.h diff --git a/source/Mobs/Squid.cpp b/src/Mobs/Squid.cpp similarity index 100% rename from source/Mobs/Squid.cpp rename to src/Mobs/Squid.cpp diff --git a/source/Mobs/Squid.h b/src/Mobs/Squid.h similarity index 100% rename from source/Mobs/Squid.h rename to src/Mobs/Squid.h diff --git a/source/Mobs/Villager.cpp b/src/Mobs/Villager.cpp similarity index 100% rename from source/Mobs/Villager.cpp rename to src/Mobs/Villager.cpp diff --git a/source/Mobs/Villager.h b/src/Mobs/Villager.h similarity index 100% rename from source/Mobs/Villager.h rename to src/Mobs/Villager.h diff --git a/source/Mobs/Witch.cpp b/src/Mobs/Witch.cpp similarity index 100% rename from source/Mobs/Witch.cpp rename to src/Mobs/Witch.cpp diff --git a/source/Mobs/Witch.h b/src/Mobs/Witch.h similarity index 100% rename from source/Mobs/Witch.h rename to src/Mobs/Witch.h diff --git a/source/Mobs/Wither.cpp b/src/Mobs/Wither.cpp similarity index 100% rename from source/Mobs/Wither.cpp rename to src/Mobs/Wither.cpp diff --git a/source/Mobs/Wither.h b/src/Mobs/Wither.h similarity index 100% rename from source/Mobs/Wither.h rename to src/Mobs/Wither.h diff --git a/source/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp similarity index 100% rename from source/Mobs/Wolf.cpp rename to src/Mobs/Wolf.cpp diff --git a/source/Mobs/Wolf.h b/src/Mobs/Wolf.h similarity index 100% rename from source/Mobs/Wolf.h rename to src/Mobs/Wolf.h diff --git a/source/Mobs/Zombie.cpp b/src/Mobs/Zombie.cpp similarity index 100% rename from source/Mobs/Zombie.cpp rename to src/Mobs/Zombie.cpp diff --git a/source/Mobs/Zombie.h b/src/Mobs/Zombie.h similarity index 100% rename from source/Mobs/Zombie.h rename to src/Mobs/Zombie.h diff --git a/source/Mobs/Zombiepigman.cpp b/src/Mobs/Zombiepigman.cpp similarity index 100% rename from source/Mobs/Zombiepigman.cpp rename to src/Mobs/Zombiepigman.cpp diff --git a/source/Mobs/Zombiepigman.h b/src/Mobs/Zombiepigman.h similarity index 100% rename from source/Mobs/Zombiepigman.h rename to src/Mobs/Zombiepigman.h diff --git a/source/MonsterConfig.cpp b/src/MonsterConfig.cpp similarity index 97% rename from source/MonsterConfig.cpp rename to src/MonsterConfig.cpp index a5a1ebd49..6165606f0 100644 --- a/source/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -3,8 +3,7 @@ #include "MonsterConfig.h" #include "Mobs/Monster.h" -#include "../iniFile/iniFile.h" -//#include +#include "inifile/iniFile.h" diff --git a/source/MonsterConfig.h b/src/MonsterConfig.h similarity index 100% rename from source/MonsterConfig.h rename to src/MonsterConfig.h diff --git a/source/Noise.cpp b/src/Noise.cpp similarity index 100% rename from source/Noise.cpp rename to src/Noise.cpp diff --git a/source/Noise.h b/src/Noise.h similarity index 100% rename from source/Noise.h rename to src/Noise.h diff --git a/source/OSSupport/BlockingTCPLink.cpp b/src/OSSupport/BlockingTCPLink.cpp similarity index 100% rename from source/OSSupport/BlockingTCPLink.cpp rename to src/OSSupport/BlockingTCPLink.cpp diff --git a/source/OSSupport/BlockingTCPLink.h b/src/OSSupport/BlockingTCPLink.h similarity index 100% rename from source/OSSupport/BlockingTCPLink.h rename to src/OSSupport/BlockingTCPLink.h diff --git a/source/OSSupport/CriticalSection.cpp b/src/OSSupport/CriticalSection.cpp similarity index 100% rename from source/OSSupport/CriticalSection.cpp rename to src/OSSupport/CriticalSection.cpp diff --git a/source/OSSupport/CriticalSection.h b/src/OSSupport/CriticalSection.h similarity index 100% rename from source/OSSupport/CriticalSection.h rename to src/OSSupport/CriticalSection.h diff --git a/source/OSSupport/Event.cpp b/src/OSSupport/Event.cpp similarity index 100% rename from source/OSSupport/Event.cpp rename to src/OSSupport/Event.cpp diff --git a/source/OSSupport/Event.h b/src/OSSupport/Event.h similarity index 100% rename from source/OSSupport/Event.h rename to src/OSSupport/Event.h diff --git a/source/OSSupport/File.cpp b/src/OSSupport/File.cpp similarity index 100% rename from source/OSSupport/File.cpp rename to src/OSSupport/File.cpp diff --git a/source/OSSupport/File.h b/src/OSSupport/File.h similarity index 100% rename from source/OSSupport/File.h rename to src/OSSupport/File.h diff --git a/source/OSSupport/GZipFile.cpp b/src/OSSupport/GZipFile.cpp similarity index 100% rename from source/OSSupport/GZipFile.cpp rename to src/OSSupport/GZipFile.cpp diff --git a/source/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h similarity index 98% rename from source/OSSupport/GZipFile.h rename to src/OSSupport/GZipFile.h index e5aa68afa..dfb4e8c31 100644 --- a/source/OSSupport/GZipFile.h +++ b/src/OSSupport/GZipFile.h @@ -9,7 +9,7 @@ #pragma once -#include "zlib.h" +#include "zlib/zlib.h" diff --git a/source/OSSupport/IsThread.cpp b/src/OSSupport/IsThread.cpp similarity index 100% rename from source/OSSupport/IsThread.cpp rename to src/OSSupport/IsThread.cpp diff --git a/source/OSSupport/IsThread.h b/src/OSSupport/IsThread.h similarity index 100% rename from source/OSSupport/IsThread.h rename to src/OSSupport/IsThread.h diff --git a/source/OSSupport/ListenThread.cpp b/src/OSSupport/ListenThread.cpp similarity index 100% rename from source/OSSupport/ListenThread.cpp rename to src/OSSupport/ListenThread.cpp diff --git a/source/OSSupport/ListenThread.h b/src/OSSupport/ListenThread.h similarity index 100% rename from source/OSSupport/ListenThread.h rename to src/OSSupport/ListenThread.h diff --git a/source/OSSupport/Semaphore.cpp b/src/OSSupport/Semaphore.cpp similarity index 100% rename from source/OSSupport/Semaphore.cpp rename to src/OSSupport/Semaphore.cpp diff --git a/source/OSSupport/Semaphore.h b/src/OSSupport/Semaphore.h similarity index 100% rename from source/OSSupport/Semaphore.h rename to src/OSSupport/Semaphore.h diff --git a/source/OSSupport/Sleep.cpp b/src/OSSupport/Sleep.cpp similarity index 100% rename from source/OSSupport/Sleep.cpp rename to src/OSSupport/Sleep.cpp diff --git a/source/OSSupport/Sleep.h b/src/OSSupport/Sleep.h similarity index 100% rename from source/OSSupport/Sleep.h rename to src/OSSupport/Sleep.h diff --git a/source/OSSupport/Socket.cpp b/src/OSSupport/Socket.cpp similarity index 100% rename from source/OSSupport/Socket.cpp rename to src/OSSupport/Socket.cpp diff --git a/source/OSSupport/Socket.h b/src/OSSupport/Socket.h similarity index 100% rename from source/OSSupport/Socket.h rename to src/OSSupport/Socket.h diff --git a/source/OSSupport/SocketThreads.cpp b/src/OSSupport/SocketThreads.cpp similarity index 100% rename from source/OSSupport/SocketThreads.cpp rename to src/OSSupport/SocketThreads.cpp diff --git a/source/OSSupport/SocketThreads.h b/src/OSSupport/SocketThreads.h similarity index 100% rename from source/OSSupport/SocketThreads.h rename to src/OSSupport/SocketThreads.h diff --git a/source/OSSupport/Thread.cpp b/src/OSSupport/Thread.cpp similarity index 100% rename from source/OSSupport/Thread.cpp rename to src/OSSupport/Thread.cpp diff --git a/source/OSSupport/Thread.h b/src/OSSupport/Thread.h similarity index 100% rename from source/OSSupport/Thread.h rename to src/OSSupport/Thread.h diff --git a/source/OSSupport/Timer.cpp b/src/OSSupport/Timer.cpp similarity index 100% rename from source/OSSupport/Timer.cpp rename to src/OSSupport/Timer.cpp diff --git a/source/OSSupport/Timer.h b/src/OSSupport/Timer.h similarity index 100% rename from source/OSSupport/Timer.h rename to src/OSSupport/Timer.h diff --git a/source/Piston.cpp b/src/Piston.cpp similarity index 100% rename from source/Piston.cpp rename to src/Piston.cpp diff --git a/source/Piston.h b/src/Piston.h similarity index 100% rename from source/Piston.h rename to src/Piston.h diff --git a/source/Plugin.cpp b/src/Plugin.cpp similarity index 100% rename from source/Plugin.cpp rename to src/Plugin.cpp diff --git a/source/Plugin.h b/src/Plugin.h similarity index 100% rename from source/Plugin.h rename to src/Plugin.h diff --git a/source/PluginLua.cpp b/src/PluginLua.cpp similarity index 99% rename from source/PluginLua.cpp rename to src/PluginLua.cpp index 23d079b05..4ddf191ac 100644 --- a/source/PluginLua.cpp +++ b/src/PluginLua.cpp @@ -11,7 +11,7 @@ extern "C" { - #include "lualib.h" + #include "lua/src/lualib.h" } #include "tolua++.h" diff --git a/source/PluginLua.h b/src/PluginLua.h similarity index 100% rename from source/PluginLua.h rename to src/PluginLua.h diff --git a/source/PluginManager.cpp b/src/PluginManager.cpp similarity index 99% rename from source/PluginManager.cpp rename to src/PluginManager.cpp index e08ebe503..bb6f2a24b 100644 --- a/source/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -10,7 +10,7 @@ #include "Server.h" #include "CommandOutput.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "tolua++.h" #include "Entities/Player.h" diff --git a/source/PluginManager.h b/src/PluginManager.h similarity index 100% rename from source/PluginManager.h rename to src/PluginManager.h diff --git a/source/ProbabDistrib.cpp b/src/ProbabDistrib.cpp similarity index 100% rename from source/ProbabDistrib.cpp rename to src/ProbabDistrib.cpp diff --git a/source/ProbabDistrib.h b/src/ProbabDistrib.h similarity index 100% rename from source/ProbabDistrib.h rename to src/ProbabDistrib.h diff --git a/source/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp similarity index 99% rename from source/Protocol/ChunkDataSerializer.cpp rename to src/Protocol/ChunkDataSerializer.cpp index 2a9230fee..78318a5ee 100644 --- a/source/Protocol/ChunkDataSerializer.cpp +++ b/src/Protocol/ChunkDataSerializer.cpp @@ -7,7 +7,7 @@ #include "Globals.h" #include "ChunkDataSerializer.h" -#include "zlib.h" +#include "zlib/zlib.h" diff --git a/source/Protocol/ChunkDataSerializer.h b/src/Protocol/ChunkDataSerializer.h similarity index 100% rename from source/Protocol/ChunkDataSerializer.h rename to src/Protocol/ChunkDataSerializer.h diff --git a/source/Protocol/Protocol.h b/src/Protocol/Protocol.h similarity index 100% rename from source/Protocol/Protocol.h rename to src/Protocol/Protocol.h diff --git a/source/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp similarity index 100% rename from source/Protocol/Protocol125.cpp rename to src/Protocol/Protocol125.cpp diff --git a/source/Protocol/Protocol125.h b/src/Protocol/Protocol125.h similarity index 100% rename from source/Protocol/Protocol125.h rename to src/Protocol/Protocol125.h diff --git a/source/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp similarity index 99% rename from source/Protocol/Protocol132.cpp rename to src/Protocol/Protocol132.cpp index 22eac4312..d8f450588 100644 --- a/source/Protocol/Protocol132.cpp +++ b/src/Protocol/Protocol132.cpp @@ -4,14 +4,14 @@ // Implements the cProtocol132 class representing the release 1.3.2 protocol (#39) #include "Globals.h" +#include "ChunkDataSerializer.h" +#include "cryptopp/randpool.h" #include "Protocol132.h" #include "../Root.h" #include "../Server.h" #include "../World.h" #include "../ClientHandle.h" -#include "../../CryptoPP/randpool.h" #include "../Item.h" -#include "ChunkDataSerializer.h" #include "../Entities/Player.h" #include "../Mobs/Monster.h" #include "../UI/Window.h" diff --git a/source/Protocol/Protocol132.h b/src/Protocol/Protocol132.h similarity index 98% rename from source/Protocol/Protocol132.h rename to src/Protocol/Protocol132.h index dc4d8aeef..f76272b8d 100644 --- a/source/Protocol/Protocol132.h +++ b/src/Protocol/Protocol132.h @@ -10,8 +10,8 @@ #pragma once #include "Protocol125.h" -#include "../../CryptoPP/modes.h" -#include "../../CryptoPP/aes.h" +#include "cryptopp/modes.h" +#include "cryptopp/aes.h" diff --git a/source/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp similarity index 99% rename from source/Protocol/Protocol14x.cpp rename to src/Protocol/Protocol14x.cpp index d2582458b..28122034c 100644 --- a/source/Protocol/Protocol14x.cpp +++ b/src/Protocol/Protocol14x.cpp @@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols: #include "../Root.h" #include "../Server.h" #include "../ClientHandle.h" -#include "../../CryptoPP/randpool.h" +#include "cryptopp/randpool.h" #include "../Item.h" #include "ChunkDataSerializer.h" #include "../Entities/Player.h" diff --git a/source/Protocol/Protocol14x.h b/src/Protocol/Protocol14x.h similarity index 100% rename from source/Protocol/Protocol14x.h rename to src/Protocol/Protocol14x.h diff --git a/source/Protocol/Protocol15x.cpp b/src/Protocol/Protocol15x.cpp similarity index 100% rename from source/Protocol/Protocol15x.cpp rename to src/Protocol/Protocol15x.cpp diff --git a/source/Protocol/Protocol15x.h b/src/Protocol/Protocol15x.h similarity index 100% rename from source/Protocol/Protocol15x.h rename to src/Protocol/Protocol15x.h diff --git a/source/Protocol/Protocol16x.cpp b/src/Protocol/Protocol16x.cpp similarity index 100% rename from source/Protocol/Protocol16x.cpp rename to src/Protocol/Protocol16x.cpp diff --git a/source/Protocol/Protocol16x.h b/src/Protocol/Protocol16x.h similarity index 100% rename from source/Protocol/Protocol16x.h rename to src/Protocol/Protocol16x.h diff --git a/source/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp similarity index 100% rename from source/Protocol/Protocol17x.cpp rename to src/Protocol/Protocol17x.cpp diff --git a/source/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h similarity index 99% rename from source/Protocol/Protocol17x.h rename to src/Protocol/Protocol17x.h index 255cb4ef5..9c1eaa99a 100644 --- a/source/Protocol/Protocol17x.h +++ b/src/Protocol/Protocol17x.h @@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes: #include "Protocol.h" #include "../ByteBuffer.h" -#include "../../CryptoPP/modes.h" -#include "../../CryptoPP/aes.h" +#include "cryptopp/modes.h" +#include "cryptopp/aes.h" diff --git a/source/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp similarity index 100% rename from source/Protocol/ProtocolRecognizer.cpp rename to src/Protocol/ProtocolRecognizer.cpp diff --git a/source/Protocol/ProtocolRecognizer.h b/src/Protocol/ProtocolRecognizer.h similarity index 100% rename from source/Protocol/ProtocolRecognizer.h rename to src/Protocol/ProtocolRecognizer.h diff --git a/source/RCONServer.cpp b/src/RCONServer.cpp similarity index 99% rename from source/RCONServer.cpp rename to src/RCONServer.cpp index 3f86a7ca2..72f2d9ba9 100644 --- a/source/RCONServer.cpp +++ b/src/RCONServer.cpp @@ -4,7 +4,7 @@ // Implements the cRCONServer class representing the RCON server #include "Globals.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "RCONServer.h" #include "Server.h" #include "Root.h" diff --git a/source/RCONServer.h b/src/RCONServer.h similarity index 100% rename from source/RCONServer.h rename to src/RCONServer.h diff --git a/source/ReferenceManager.cpp b/src/ReferenceManager.cpp similarity index 100% rename from source/ReferenceManager.cpp rename to src/ReferenceManager.cpp diff --git a/source/ReferenceManager.h b/src/ReferenceManager.h similarity index 100% rename from source/ReferenceManager.h rename to src/ReferenceManager.h diff --git a/source/Root.cpp b/src/Root.cpp similarity index 99% rename from source/Root.cpp rename to src/Root.cpp index 5bb04abfb..4a6abaf37 100644 --- a/source/Root.cpp +++ b/src/Root.cpp @@ -19,7 +19,7 @@ #include "DeadlockDetect.h" #include "OSSupport/Timer.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #ifdef _WIN32 #include diff --git a/source/Root.h b/src/Root.h similarity index 100% rename from source/Root.h rename to src/Root.h diff --git a/source/Server.cpp b/src/Server.cpp similarity index 99% rename from source/Server.cpp rename to src/Server.cpp index fe8076631..5951dc5b5 100644 --- a/source/Server.cpp +++ b/src/Server.cpp @@ -23,7 +23,7 @@ #include "MersenneTwister.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "Vector3f.h" #include @@ -31,7 +31,7 @@ #include extern "C" { - #include "zlib.h" + #include "zlib/zlib.h" } diff --git a/source/Server.h b/src/Server.h similarity index 98% rename from source/Server.h rename to src/Server.h index 1b4848318..0d93469a5 100644 --- a/source/Server.h +++ b/src/Server.h @@ -11,8 +11,8 @@ #include "OSSupport/SocketThreads.h" #include "OSSupport/ListenThread.h" -#include "CryptoPP/rsa.h" -#include "CryptoPP/randpool.h" +#include "cryptopp/rsa.h" +#include "cryptopp/randpool.h" #include "RCONServer.h" diff --git a/source/Simulator/DelayedFluidSimulator.cpp b/src/Simulator/DelayedFluidSimulator.cpp similarity index 100% rename from source/Simulator/DelayedFluidSimulator.cpp rename to src/Simulator/DelayedFluidSimulator.cpp diff --git a/source/Simulator/DelayedFluidSimulator.h b/src/Simulator/DelayedFluidSimulator.h similarity index 100% rename from source/Simulator/DelayedFluidSimulator.h rename to src/Simulator/DelayedFluidSimulator.h diff --git a/source/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp similarity index 100% rename from source/Simulator/FireSimulator.cpp rename to src/Simulator/FireSimulator.cpp diff --git a/source/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h similarity index 100% rename from source/Simulator/FireSimulator.h rename to src/Simulator/FireSimulator.h diff --git a/source/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp similarity index 100% rename from source/Simulator/FloodyFluidSimulator.cpp rename to src/Simulator/FloodyFluidSimulator.cpp diff --git a/source/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h similarity index 100% rename from source/Simulator/FloodyFluidSimulator.h rename to src/Simulator/FloodyFluidSimulator.h diff --git a/source/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp similarity index 100% rename from source/Simulator/FluidSimulator.cpp rename to src/Simulator/FluidSimulator.cpp diff --git a/source/Simulator/FluidSimulator.h b/src/Simulator/FluidSimulator.h similarity index 100% rename from source/Simulator/FluidSimulator.h rename to src/Simulator/FluidSimulator.h diff --git a/source/Simulator/NoopFluidSimulator.h b/src/Simulator/NoopFluidSimulator.h similarity index 100% rename from source/Simulator/NoopFluidSimulator.h rename to src/Simulator/NoopFluidSimulator.h diff --git a/source/Simulator/RedstoneSimulator.cpp b/src/Simulator/RedstoneSimulator.cpp similarity index 100% rename from source/Simulator/RedstoneSimulator.cpp rename to src/Simulator/RedstoneSimulator.cpp diff --git a/source/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h similarity index 100% rename from source/Simulator/RedstoneSimulator.h rename to src/Simulator/RedstoneSimulator.h diff --git a/source/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp similarity index 100% rename from source/Simulator/SandSimulator.cpp rename to src/Simulator/SandSimulator.cpp diff --git a/source/Simulator/SandSimulator.h b/src/Simulator/SandSimulator.h similarity index 100% rename from source/Simulator/SandSimulator.h rename to src/Simulator/SandSimulator.h diff --git a/source/Simulator/Simulator.cpp b/src/Simulator/Simulator.cpp similarity index 100% rename from source/Simulator/Simulator.cpp rename to src/Simulator/Simulator.cpp diff --git a/source/Simulator/Simulator.h b/src/Simulator/Simulator.h similarity index 96% rename from source/Simulator/Simulator.h rename to src/Simulator/Simulator.h index e1d88f1c5..5cd0e8657 100644 --- a/source/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -2,7 +2,7 @@ #pragma once #include "../Vector3i.h" -#include "../../iniFile/iniFile.h" +#include "inifile/iniFile.h" diff --git a/source/Simulator/SimulatorManager.cpp b/src/Simulator/SimulatorManager.cpp similarity index 100% rename from source/Simulator/SimulatorManager.cpp rename to src/Simulator/SimulatorManager.cpp diff --git a/source/Simulator/SimulatorManager.h b/src/Simulator/SimulatorManager.h similarity index 100% rename from source/Simulator/SimulatorManager.h rename to src/Simulator/SimulatorManager.h diff --git a/source/Simulator/VaporizeFluidSimulator.cpp b/src/Simulator/VaporizeFluidSimulator.cpp similarity index 100% rename from source/Simulator/VaporizeFluidSimulator.cpp rename to src/Simulator/VaporizeFluidSimulator.cpp diff --git a/source/Simulator/VaporizeFluidSimulator.h b/src/Simulator/VaporizeFluidSimulator.h similarity index 100% rename from source/Simulator/VaporizeFluidSimulator.h rename to src/Simulator/VaporizeFluidSimulator.h diff --git a/source/StackWalker.cpp b/src/StackWalker.cpp similarity index 100% rename from source/StackWalker.cpp rename to src/StackWalker.cpp diff --git a/source/StackWalker.h b/src/StackWalker.h similarity index 100% rename from source/StackWalker.h rename to src/StackWalker.h diff --git a/source/StringCompression.cpp b/src/StringCompression.cpp similarity index 100% rename from source/StringCompression.cpp rename to src/StringCompression.cpp diff --git a/source/StringCompression.h b/src/StringCompression.h similarity index 93% rename from source/StringCompression.h rename to src/StringCompression.h index 8afdf59e0..459e8f568 100644 --- a/source/StringCompression.h +++ b/src/StringCompression.h @@ -3,7 +3,7 @@ // Interfaces to the wrapping functions for compression and decompression using AString as their data -#include "zlib.h" // Needed for the Z_XXX return values +#include "zlib/zlib.h" // Needed for the Z_XXX return values diff --git a/source/StringUtils.cpp b/src/StringUtils.cpp similarity index 100% rename from source/StringUtils.cpp rename to src/StringUtils.cpp diff --git a/source/StringUtils.h b/src/StringUtils.h similarity index 100% rename from source/StringUtils.h rename to src/StringUtils.h diff --git a/source/Tracer.cpp b/src/Tracer.cpp similarity index 100% rename from source/Tracer.cpp rename to src/Tracer.cpp diff --git a/source/Tracer.h b/src/Tracer.h similarity index 100% rename from source/Tracer.h rename to src/Tracer.h diff --git a/source/UI/SlotArea.cpp b/src/UI/SlotArea.cpp similarity index 100% rename from source/UI/SlotArea.cpp rename to src/UI/SlotArea.cpp diff --git a/source/UI/SlotArea.h b/src/UI/SlotArea.h similarity index 100% rename from source/UI/SlotArea.h rename to src/UI/SlotArea.h diff --git a/source/UI/Window.cpp b/src/UI/Window.cpp similarity index 100% rename from source/UI/Window.cpp rename to src/UI/Window.cpp diff --git a/source/UI/Window.h b/src/UI/Window.h similarity index 100% rename from source/UI/Window.h rename to src/UI/Window.h diff --git a/source/UI/WindowOwner.h b/src/UI/WindowOwner.h similarity index 100% rename from source/UI/WindowOwner.h rename to src/UI/WindowOwner.h diff --git a/source/Vector3d.cpp b/src/Vector3d.cpp similarity index 100% rename from source/Vector3d.cpp rename to src/Vector3d.cpp diff --git a/source/Vector3d.h b/src/Vector3d.h similarity index 100% rename from source/Vector3d.h rename to src/Vector3d.h diff --git a/source/Vector3f.cpp b/src/Vector3f.cpp similarity index 100% rename from source/Vector3f.cpp rename to src/Vector3f.cpp diff --git a/source/Vector3f.h b/src/Vector3f.h similarity index 100% rename from source/Vector3f.h rename to src/Vector3f.h diff --git a/source/Vector3i.cpp b/src/Vector3i.cpp similarity index 100% rename from source/Vector3i.cpp rename to src/Vector3i.cpp diff --git a/source/Vector3i.h b/src/Vector3i.h similarity index 100% rename from source/Vector3i.h rename to src/Vector3i.h diff --git a/source/WebAdmin.cpp b/src/WebAdmin.cpp similarity index 100% rename from source/WebAdmin.cpp rename to src/WebAdmin.cpp diff --git a/source/WebAdmin.h b/src/WebAdmin.h similarity index 99% rename from source/WebAdmin.h rename to src/WebAdmin.h index dc6ea850e..a775acec2 100644 --- a/source/WebAdmin.h +++ b/src/WebAdmin.h @@ -7,7 +7,7 @@ #include "OSSupport/Socket.h" #include "LuaState.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "HTTPServer/HTTPServer.h" #include "HTTPServer/HTTPFormParser.h" diff --git a/source/WebPlugin.cpp b/src/WebPlugin.cpp similarity index 100% rename from source/WebPlugin.cpp rename to src/WebPlugin.cpp diff --git a/source/WebPlugin.h b/src/WebPlugin.h similarity index 100% rename from source/WebPlugin.h rename to src/WebPlugin.h diff --git a/source/World.cpp b/src/World.cpp similarity index 99% rename from source/World.cpp rename to src/World.cpp index de64b1c20..fb8ee0cb3 100644 --- a/source/World.cpp +++ b/src/World.cpp @@ -8,7 +8,7 @@ #include "Server.h" #include "Item.h" #include "Root.h" -#include "../iniFile/iniFile.h" +#include "inifile/iniFile.h" #include "ChunkMap.h" #include "OSSupport/Timer.h" diff --git a/source/World.h b/src/World.h similarity index 100% rename from source/World.h rename to src/World.h diff --git a/source/WorldStorage/FastNBT.cpp b/src/WorldStorage/FastNBT.cpp similarity index 100% rename from source/WorldStorage/FastNBT.cpp rename to src/WorldStorage/FastNBT.cpp diff --git a/source/WorldStorage/FastNBT.h b/src/WorldStorage/FastNBT.h similarity index 100% rename from source/WorldStorage/FastNBT.h rename to src/WorldStorage/FastNBT.h diff --git a/source/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp similarity index 100% rename from source/WorldStorage/NBTChunkSerializer.cpp rename to src/WorldStorage/NBTChunkSerializer.cpp diff --git a/source/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h similarity index 100% rename from source/WorldStorage/NBTChunkSerializer.h rename to src/WorldStorage/NBTChunkSerializer.h diff --git a/source/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp similarity index 99% rename from source/WorldStorage/WSSAnvil.cpp rename to src/WorldStorage/WSSAnvil.cpp index b2e104a78..79be4dfa2 100644 --- a/source/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -7,7 +7,7 @@ #include "WSSAnvil.h" #include "NBTChunkSerializer.h" #include "../World.h" -#include "zlib.h" +#include "zlib/zlib.h" #include "../BlockID.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/source/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h similarity index 100% rename from source/WorldStorage/WSSAnvil.h rename to src/WorldStorage/WSSAnvil.h diff --git a/source/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp similarity index 99% rename from source/WorldStorage/WSSCompact.cpp rename to src/WorldStorage/WSSCompact.cpp index 694f3ed1d..287938b24 100644 --- a/source/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -6,8 +6,8 @@ #include "Globals.h" #include "WSSCompact.h" #include "../World.h" -#include "zlib.h" -#include +#include "zlib/zlib.h" +#include "json/json.h" #include "../StringCompression.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/source/WorldStorage/WSSCompact.h b/src/WorldStorage/WSSCompact.h similarity index 100% rename from source/WorldStorage/WSSCompact.h rename to src/WorldStorage/WSSCompact.h diff --git a/source/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp similarity index 100% rename from source/WorldStorage/WorldStorage.cpp rename to src/WorldStorage/WorldStorage.cpp diff --git a/source/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h similarity index 99% rename from source/WorldStorage/WorldStorage.h rename to src/WorldStorage/WorldStorage.h index bf8dbd3d5..98e7e1686 100644 --- a/source/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -16,7 +16,7 @@ #include "../ChunkDef.h" #include "../OSSupport/IsThread.h" -#include +#include "json/json.h" diff --git a/source/XMLParser.h b/src/XMLParser.h similarity index 100% rename from source/XMLParser.h rename to src/XMLParser.h diff --git a/source/lua5.1.dll b/src/lua5.1.dll similarity index 100% rename from source/lua5.1.dll rename to src/lua5.1.dll diff --git a/source/main.cpp b/src/main.cpp similarity index 100% rename from source/main.cpp rename to src/main.cpp diff --git a/source/tolua++.exe b/src/tolua++.exe similarity index 100% rename from source/tolua++.exe rename to src/tolua++.exe diff --git a/source/tolua++.h b/src/tolua++.h similarity index 99% rename from source/tolua++.h rename to src/tolua++.h index ed5344926..8da427fe3 100644 --- a/source/tolua++.h +++ b/src/tolua++.h @@ -43,8 +43,8 @@ extern "C" { typedef int lua_Object; -#include "lua.h" -#include "lauxlib.h" +#include "lua/src/lua.h" +#include "lua/src/lauxlib.h" struct tolua_Error { diff --git a/source/tolua_base.h b/src/tolua_base.h similarity index 100% rename from source/tolua_base.h rename to src/tolua_base.h diff --git a/source/virtual_method_hooks.lua b/src/virtual_method_hooks.lua similarity index 100% rename from source/virtual_method_hooks.lua rename to src/virtual_method_hooks.lua