Merge pull request #370 from mc-server/foldermove2

Moved all the folders :D

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
+
+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))

VC2008/CryptoPP.cbp

@@ -106,202 +106,202 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../CryptoPP/Doxyfile" />
-		<Unit filename="../CryptoPP/GNUmakefile" />
-		<Unit filename="../CryptoPP/License.txt" />
-		<Unit filename="../CryptoPP/Readme.txt" />
-		<Unit filename="../CryptoPP/adler32.cpp" />
-		<Unit filename="../CryptoPP/adler32.h" />
-		<Unit filename="../CryptoPP/aes.h" />
-		<Unit filename="../CryptoPP/algebra.cpp" />
-		<Unit filename="../CryptoPP/algebra.h" />
-		<Unit filename="../CryptoPP/algparam.cpp" />
-		<Unit filename="../CryptoPP/algparam.h" />
-		<Unit filename="../CryptoPP/arc4.h" />
-		<Unit filename="../CryptoPP/argnames.h" />
-		<Unit filename="../CryptoPP/asn.cpp" />
-		<Unit filename="../CryptoPP/asn.h" />
-		<Unit filename="../CryptoPP/authenc.cpp" />
-		<Unit filename="../CryptoPP/authenc.h" />
-		<Unit filename="../CryptoPP/base32.cpp" />
-		<Unit filename="../CryptoPP/base32.h" />
-		<Unit filename="../CryptoPP/base64.cpp" />
-		<Unit filename="../CryptoPP/base64.h" />
-		<Unit filename="../CryptoPP/basecode.cpp" />
-		<Unit filename="../CryptoPP/basecode.h" />
-		<Unit filename="../CryptoPP/cbcmac.cpp" />
-		<Unit filename="../CryptoPP/cbcmac.h" />
-		<Unit filename="../CryptoPP/ccm.cpp" />
-		<Unit filename="../CryptoPP/ccm.h" />
-		<Unit filename="../CryptoPP/channels.cpp" />
-		<Unit filename="../CryptoPP/channels.h" />
-		<Unit filename="../CryptoPP/cmac.cpp" />
-		<Unit filename="../CryptoPP/cmac.h" />
-		<Unit filename="../CryptoPP/config.h" />
-		<Unit filename="../CryptoPP/cpu.cpp" />
-		<Unit filename="../CryptoPP/cpu.h" />
-		<Unit filename="../CryptoPP/crc.cpp" />
-		<Unit filename="../CryptoPP/crc.h" />
-		<Unit filename="../CryptoPP/cryptlib.cpp" />
-		<Unit filename="../CryptoPP/cryptlib.h" />
-		<Unit filename="../CryptoPP/default.cpp" />
-		<Unit filename="../CryptoPP/default.h" />
-		<Unit filename="../CryptoPP/des.cpp" />
-		<Unit filename="../CryptoPP/des.h" />
-		<Unit filename="../CryptoPP/dessp.cpp" />
-		<Unit filename="../CryptoPP/dh.cpp" />
-		<Unit filename="../CryptoPP/dh.h" />
-		<Unit filename="../CryptoPP/dh2.cpp" />
-		<Unit filename="../CryptoPP/dh2.h" />
-		<Unit filename="../CryptoPP/dll.cpp" />
-		<Unit filename="../CryptoPP/dmac.h" />
-		<Unit filename="../CryptoPP/dsa.cpp" />
-		<Unit filename="../CryptoPP/dsa.h" />
-		<Unit filename="../CryptoPP/eax.cpp" />
-		<Unit filename="../CryptoPP/eax.h" />
-		<Unit filename="../CryptoPP/ec2n.cpp" />
-		<Unit filename="../CryptoPP/ec2n.h" />
-		<Unit filename="../CryptoPP/eccrypto.cpp">
+		<Unit filename="../lib/cryptopp/Doxyfile" />
+		<Unit filename="../lib/cryptopp/GNUmakefile" />
+		<Unit filename="../lib/cryptopp/License.txt" />
+		<Unit filename="../lib/cryptopp/Readme.txt" />
+		<Unit filename="../lib/cryptopp/adler32.cpp" />
+		<Unit filename="../lib/cryptopp/adler32.h" />
+		<Unit filename="../lib/cryptopp/aes.h" />
+		<Unit filename="../lib/cryptopp/algebra.cpp" />
+		<Unit filename="../lib/cryptopp/algebra.h" />
+		<Unit filename="../lib/cryptopp/algparam.cpp" />
+		<Unit filename="../lib/cryptopp/algparam.h" />
+		<Unit filename="../lib/cryptopp/arc4.h" />
+		<Unit filename="../lib/cryptopp/argnames.h" />
+		<Unit filename="../lib/cryptopp/asn.cpp" />
+		<Unit filename="../lib/cryptopp/asn.h" />
+		<Unit filename="../lib/cryptopp/authenc.cpp" />
+		<Unit filename="../lib/cryptopp/authenc.h" />
+		<Unit filename="../lib/cryptopp/base32.cpp" />
+		<Unit filename="../lib/cryptopp/base32.h" />
+		<Unit filename="../lib/cryptopp/base64.cpp" />
+		<Unit filename="../lib/cryptopp/base64.h" />
+		<Unit filename="../lib/cryptopp/basecode.cpp" />
+		<Unit filename="../lib/cryptopp/basecode.h" />
+		<Unit filename="../lib/cryptopp/cbcmac.cpp" />
+		<Unit filename="../lib/cryptopp/cbcmac.h" />
+		<Unit filename="../lib/cryptopp/ccm.cpp" />
+		<Unit filename="../lib/cryptopp/ccm.h" />
+		<Unit filename="../lib/cryptopp/channels.cpp" />
+		<Unit filename="../lib/cryptopp/channels.h" />
+		<Unit filename="../lib/cryptopp/cmac.cpp" />
+		<Unit filename="../lib/cryptopp/cmac.h" />
+		<Unit filename="../lib/cryptopp/config.h" />
+		<Unit filename="../lib/cryptopp/cpu.cpp" />
+		<Unit filename="../lib/cryptopp/cpu.h" />
+		<Unit filename="../lib/cryptopp/crc.cpp" />
+		<Unit filename="../lib/cryptopp/crc.h" />
+		<Unit filename="../lib/cryptopp/cryptlib.cpp" />
+		<Unit filename="../lib/cryptopp/cryptlib.h" />
+		<Unit filename="../lib/cryptopp/default.cpp" />
+		<Unit filename="../lib/cryptopp/default.h" />
+		<Unit filename="../lib/cryptopp/des.cpp" />
+		<Unit filename="../lib/cryptopp/des.h" />
+		<Unit filename="../lib/cryptopp/dessp.cpp" />
+		<Unit filename="../lib/cryptopp/dh.cpp" />
+		<Unit filename="../lib/cryptopp/dh.h" />
+		<Unit filename="../lib/cryptopp/dh2.cpp" />
+		<Unit filename="../lib/cryptopp/dh2.h" />
+		<Unit filename="../lib/cryptopp/dll.cpp" />
+		<Unit filename="../lib/cryptopp/dmac.h" />
+		<Unit filename="../lib/cryptopp/dsa.cpp" />
+		<Unit filename="../lib/cryptopp/dsa.h" />
+		<Unit filename="../lib/cryptopp/eax.cpp" />
+		<Unit filename="../lib/cryptopp/eax.h" />
+		<Unit filename="../lib/cryptopp/ec2n.cpp" />
+		<Unit filename="../lib/cryptopp/ec2n.h" />
+		<Unit filename="../lib/cryptopp/eccrypto.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../CryptoPP/eccrypto.h" />
-		<Unit filename="../CryptoPP/ecp.cpp" />
-		<Unit filename="../CryptoPP/ecp.h" />
-		<Unit filename="../CryptoPP/elgamal.cpp" />
-		<Unit filename="../CryptoPP/elgamal.h" />
-		<Unit filename="../CryptoPP/emsa2.cpp" />
-		<Unit filename="../CryptoPP/emsa2.h" />
-		<Unit filename="../CryptoPP/eprecomp.cpp">
+		<Unit filename="../lib/cryptopp/eccrypto.h" />
+		<Unit filename="../lib/cryptopp/ecp.cpp" />
+		<Unit filename="../lib/cryptopp/ecp.h" />
+		<Unit filename="../lib/cryptopp/elgamal.cpp" />
+		<Unit filename="../lib/cryptopp/elgamal.h" />
+		<Unit filename="../lib/cryptopp/emsa2.cpp" />
+		<Unit filename="../lib/cryptopp/emsa2.h" />
+		<Unit filename="../lib/cryptopp/eprecomp.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../CryptoPP/eprecomp.h" />
-		<Unit filename="../CryptoPP/esign.cpp" />
-		<Unit filename="../CryptoPP/esign.h" />
-		<Unit filename="../CryptoPP/files.cpp" />
-		<Unit filename="../CryptoPP/files.h" />
-		<Unit filename="../CryptoPP/filters.cpp" />
-		<Unit filename="../CryptoPP/filters.h" />
-		<Unit filename="../CryptoPP/fips140.cpp" />
-		<Unit filename="../CryptoPP/fips140.h" />
-		<Unit filename="../CryptoPP/fltrimpl.h" />
-		<Unit filename="../CryptoPP/gcm.cpp" />
-		<Unit filename="../CryptoPP/gcm.h" />
-		<Unit filename="../CryptoPP/gf256.cpp" />
-		<Unit filename="../CryptoPP/gf256.h" />
-		<Unit filename="../CryptoPP/gf2_32.cpp" />
-		<Unit filename="../CryptoPP/gf2_32.h" />
-		<Unit filename="../CryptoPP/gf2n.cpp" />
-		<Unit filename="../CryptoPP/gf2n.h" />
-		<Unit filename="../CryptoPP/gfpcrypt.cpp" />
-		<Unit filename="../CryptoPP/gfpcrypt.h" />
-		<Unit filename="../CryptoPP/gzip.h" />
-		<Unit filename="../CryptoPP/hex.cpp" />
-		<Unit filename="../CryptoPP/hex.h" />
-		<Unit filename="../CryptoPP/hmac.cpp" />
-		<Unit filename="../CryptoPP/hmac.h" />
-		<Unit filename="../CryptoPP/hrtimer.cpp" />
-		<Unit filename="../CryptoPP/hrtimer.h" />
-		<Unit filename="../CryptoPP/integer.cpp" />
-		<Unit filename="../CryptoPP/integer.h" />
-		<Unit filename="../CryptoPP/iterhash.cpp" />
-		<Unit filename="../CryptoPP/iterhash.h" />
-		<Unit filename="../CryptoPP/lubyrack.h" />
-		<Unit filename="../CryptoPP/luc.cpp" />
-		<Unit filename="../CryptoPP/luc.h" />
-		<Unit filename="../CryptoPP/md2.cpp" />
-		<Unit filename="../CryptoPP/md2.h" />
-		<Unit filename="../CryptoPP/md4.cpp" />
-		<Unit filename="../CryptoPP/md4.h" />
-		<Unit filename="../CryptoPP/md5.cpp" />
-		<Unit filename="../CryptoPP/md5.h" />
-		<Unit filename="../CryptoPP/mdc.h" />
-		<Unit filename="../CryptoPP/misc.cpp" />
-		<Unit filename="../CryptoPP/misc.h" />
-		<Unit filename="../CryptoPP/modarith.h" />
-		<Unit filename="../CryptoPP/modes.cpp" />
-		<Unit filename="../CryptoPP/modes.h" />
-		<Unit filename="../CryptoPP/modexppc.h" />
-		<Unit filename="../CryptoPP/mqueue.cpp" />
-		<Unit filename="../CryptoPP/mqueue.h" />
-		<Unit filename="../CryptoPP/mqv.cpp" />
-		<Unit filename="../CryptoPP/mqv.h" />
-		<Unit filename="../CryptoPP/nbtheory.cpp" />
-		<Unit filename="../CryptoPP/nbtheory.h" />
-		<Unit filename="../CryptoPP/network.cpp" />
-		<Unit filename="../CryptoPP/network.h" />
-		<Unit filename="../CryptoPP/nr.h" />
-		<Unit filename="../CryptoPP/oaep.cpp" />
-		<Unit filename="../CryptoPP/oaep.h" />
-		<Unit filename="../CryptoPP/oids.h" />
-		<Unit filename="../CryptoPP/osrng.cpp" />
-		<Unit filename="../CryptoPP/osrng.h" />
-		<Unit filename="../CryptoPP/pch.cpp" />
-		<Unit filename="../CryptoPP/pch.h" />
-		<Unit filename="../CryptoPP/pkcspad.cpp" />
-		<Unit filename="../CryptoPP/pkcspad.h" />
-		<Unit filename="../CryptoPP/polynomi.cpp" />
-		<Unit filename="../CryptoPP/polynomi.h" />
-		<Unit filename="../CryptoPP/pssr.cpp" />
-		<Unit filename="../CryptoPP/pssr.h" />
-		<Unit filename="../CryptoPP/pubkey.cpp" />
-		<Unit filename="../CryptoPP/pubkey.h" />
-		<Unit filename="../CryptoPP/pwdbased.h" />
-		<Unit filename="../CryptoPP/queue.cpp" />
-		<Unit filename="../CryptoPP/queue.h" />
-		<Unit filename="../CryptoPP/rabin.cpp" />
-		<Unit filename="../CryptoPP/rabin.h" />
-		<Unit filename="../CryptoPP/randpool.cpp" />
-		<Unit filename="../CryptoPP/randpool.h" />
-		<Unit filename="../CryptoPP/rdtables.cpp" />
-		<Unit filename="../CryptoPP/rijndael.cpp" />
-		<Unit filename="../CryptoPP/rijndael.h" />
-		<Unit filename="../CryptoPP/rng.cpp" />
-		<Unit filename="../CryptoPP/rng.h" />
-		<Unit filename="../CryptoPP/rsa.cpp" />
-		<Unit filename="../CryptoPP/rsa.h" />
-		<Unit filename="../CryptoPP/rw.cpp" />
-		<Unit filename="../CryptoPP/rw.h" />
-		<Unit filename="../CryptoPP/safer.cpp" />
-		<Unit filename="../CryptoPP/safer.h" />
-		<Unit filename="../CryptoPP/seal.cpp" />
-		<Unit filename="../CryptoPP/seal.h" />
-		<Unit filename="../CryptoPP/secblock.h" />
-		<Unit filename="../CryptoPP/seckey.h" />
-		<Unit filename="../CryptoPP/seed.cpp" />
-		<Unit filename="../CryptoPP/seed.h" />
-		<Unit filename="../CryptoPP/sha.cpp" />
-		<Unit filename="../CryptoPP/sha.h" />
-		<Unit filename="../CryptoPP/shacal2.cpp" />
-		<Unit filename="../CryptoPP/shacal2.h" />
-		<Unit filename="../CryptoPP/simple.cpp" />
-		<Unit filename="../CryptoPP/simple.h" />
-		<Unit filename="../CryptoPP/smartptr.h" />
-		<Unit filename="../CryptoPP/socketft.cpp" />
-		<Unit filename="../CryptoPP/socketft.h" />
-		<Unit filename="../CryptoPP/square.cpp" />
-		<Unit filename="../CryptoPP/square.h" />
-		<Unit filename="../CryptoPP/squaretb.cpp" />
-		<Unit filename="../CryptoPP/stdcpp.h" />
-		<Unit filename="../CryptoPP/strciphr.cpp" />
-		<Unit filename="../CryptoPP/strciphr.h" />
-		<Unit filename="../CryptoPP/tea.cpp" />
-		<Unit filename="../CryptoPP/tea.h" />
-		<Unit filename="../CryptoPP/tiger.cpp" />
-		<Unit filename="../CryptoPP/tiger.h" />
-		<Unit filename="../CryptoPP/tigertab.cpp" />
-		<Unit filename="../CryptoPP/trdlocal.cpp" />
-		<Unit filename="../CryptoPP/trdlocal.h" />
-		<Unit filename="../CryptoPP/trunhash.h" />
-		<Unit filename="../CryptoPP/ttmac.cpp" />
-		<Unit filename="../CryptoPP/ttmac.h" />
-		<Unit filename="../CryptoPP/vmac.cpp" />
-		<Unit filename="../CryptoPP/vmac.h" />
-		<Unit filename="../CryptoPP/wait.cpp" />
-		<Unit filename="../CryptoPP/wait.h" />
-		<Unit filename="../CryptoPP/wake.h" />
-		<Unit filename="../CryptoPP/winpipes.cpp" />
-		<Unit filename="../CryptoPP/winpipes.h" />
-		<Unit filename="../CryptoPP/words.h" />
+		<Unit filename="../lib/cryptopp/eprecomp.h" />
+		<Unit filename="../lib/cryptopp/esign.cpp" />
+		<Unit filename="../lib/cryptopp/esign.h" />
+		<Unit filename="../lib/cryptopp/files.cpp" />
+		<Unit filename="../lib/cryptopp/files.h" />
+		<Unit filename="../lib/cryptopp/filters.cpp" />
+		<Unit filename="../lib/cryptopp/filters.h" />
+		<Unit filename="../lib/cryptopp/fips140.cpp" />
+		<Unit filename="../lib/cryptopp/fips140.h" />
+		<Unit filename="../lib/cryptopp/fltrimpl.h" />
+		<Unit filename="../lib/cryptopp/gcm.cpp" />
+		<Unit filename="../lib/cryptopp/gcm.h" />
+		<Unit filename="../lib/cryptopp/gf256.cpp" />
+		<Unit filename="../lib/cryptopp/gf256.h" />
+		<Unit filename="../lib/cryptopp/gf2_32.cpp" />
+		<Unit filename="../lib/cryptopp/gf2_32.h" />
+		<Unit filename="../lib/cryptopp/gf2n.cpp" />
+		<Unit filename="../lib/cryptopp/gf2n.h" />
+		<Unit filename="../lib/cryptopp/gfpcrypt.cpp" />
+		<Unit filename="../lib/cryptopp/gfpcrypt.h" />
+		<Unit filename="../lib/cryptopp/gzip.h" />
+		<Unit filename="../lib/cryptopp/hex.cpp" />
+		<Unit filename="../lib/cryptopp/hex.h" />
+		<Unit filename="../lib/cryptopp/hmac.cpp" />
+		<Unit filename="../lib/cryptopp/hmac.h" />
+		<Unit filename="../lib/cryptopp/hrtimer.cpp" />
+		<Unit filename="../lib/cryptopp/hrtimer.h" />
+		<Unit filename="../lib/cryptopp/integer.cpp" />
+		<Unit filename="../lib/cryptopp/integer.h" />
+		<Unit filename="../lib/cryptopp/iterhash.cpp" />
+		<Unit filename="../lib/cryptopp/iterhash.h" />
+		<Unit filename="../lib/cryptopp/lubyrack.h" />
+		<Unit filename="../lib/cryptopp/luc.cpp" />
+		<Unit filename="../lib/cryptopp/luc.h" />
+		<Unit filename="../lib/cryptopp/md2.cpp" />
+		<Unit filename="../lib/cryptopp/md2.h" />
+		<Unit filename="../lib/cryptopp/md4.cpp" />
+		<Unit filename="../lib/cryptopp/md4.h" />
+		<Unit filename="../lib/cryptopp/md5.cpp" />
+		<Unit filename="../lib/cryptopp/md5.h" />
+		<Unit filename="../lib/cryptopp/mdc.h" />
+		<Unit filename="../lib/cryptopp/misc.cpp" />
+		<Unit filename="../lib/cryptopp/misc.h" />
+		<Unit filename="../lib/cryptopp/modarith.h" />
+		<Unit filename="../lib/cryptopp/modes.cpp" />
+		<Unit filename="../lib/cryptopp/modes.h" />
+		<Unit filename="../lib/cryptopp/modexppc.h" />
+		<Unit filename="../lib/cryptopp/mqueue.cpp" />
+		<Unit filename="../lib/cryptopp/mqueue.h" />
+		<Unit filename="../lib/cryptopp/mqv.cpp" />
+		<Unit filename="../lib/cryptopp/mqv.h" />
+		<Unit filename="../lib/cryptopp/nbtheory.cpp" />
+		<Unit filename="../lib/cryptopp/nbtheory.h" />
+		<Unit filename="../lib/cryptopp/network.cpp" />
+		<Unit filename="../lib/cryptopp/network.h" />
+		<Unit filename="../lib/cryptopp/nr.h" />
+		<Unit filename="../lib/cryptopp/oaep.cpp" />
+		<Unit filename="../lib/cryptopp/oaep.h" />
+		<Unit filename="../lib/cryptopp/oids.h" />
+		<Unit filename="../lib/cryptopp/osrng.cpp" />
+		<Unit filename="../lib/cryptopp/osrng.h" />
+		<Unit filename="../lib/cryptopp/pch.cpp" />
+		<Unit filename="../lib/cryptopp/pch.h" />
+		<Unit filename="../lib/cryptopp/pkcspad.cpp" />
+		<Unit filename="../lib/cryptopp/pkcspad.h" />
+		<Unit filename="../lib/cryptopp/polynomi.cpp" />
+		<Unit filename="../lib/cryptopp/polynomi.h" />
+		<Unit filename="../lib/cryptopp/pssr.cpp" />
+		<Unit filename="../lib/cryptopp/pssr.h" />
+		<Unit filename="../lib/cryptopp/pubkey.cpp" />
+		<Unit filename="../lib/cryptopp/pubkey.h" />
+		<Unit filename="../lib/cryptopp/pwdbased.h" />
+		<Unit filename="../lib/cryptopp/queue.cpp" />
+		<Unit filename="../lib/cryptopp/queue.h" />
+		<Unit filename="../lib/cryptopp/rabin.cpp" />
+		<Unit filename="../lib/cryptopp/rabin.h" />
+		<Unit filename="../lib/cryptopp/randpool.cpp" />
+		<Unit filename="../lib/cryptopp/randpool.h" />
+		<Unit filename="../lib/cryptopp/rdtables.cpp" />
+		<Unit filename="../lib/cryptopp/rijndael.cpp" />
+		<Unit filename="../lib/cryptopp/rijndael.h" />
+		<Unit filename="../lib/cryptopp/rng.cpp" />
+		<Unit filename="../lib/cryptopp/rng.h" />
+		<Unit filename="../lib/cryptopp/rsa.cpp" />
+		<Unit filename="../lib/cryptopp/rsa.h" />
+		<Unit filename="../lib/cryptopp/rw.cpp" />
+		<Unit filename="../lib/cryptopp/rw.h" />
+		<Unit filename="../lib/cryptopp/safer.cpp" />
+		<Unit filename="../lib/cryptopp/safer.h" />
+		<Unit filename="../lib/cryptopp/seal.cpp" />
+		<Unit filename="../lib/cryptopp/seal.h" />
+		<Unit filename="../lib/cryptopp/secblock.h" />
+		<Unit filename="../lib/cryptopp/seckey.h" />
+		<Unit filename="../lib/cryptopp/seed.cpp" />
+		<Unit filename="../lib/cryptopp/seed.h" />
+		<Unit filename="../lib/cryptopp/sha.cpp" />
+		<Unit filename="../lib/cryptopp/sha.h" />
+		<Unit filename="../lib/cryptopp/shacal2.cpp" />
+		<Unit filename="../lib/cryptopp/shacal2.h" />
+		<Unit filename="../lib/cryptopp/simple.cpp" />
+		<Unit filename="../lib/cryptopp/simple.h" />
+		<Unit filename="../lib/cryptopp/smartptr.h" />
+		<Unit filename="../lib/cryptopp/socketft.cpp" />
+		<Unit filename="../lib/cryptopp/socketft.h" />
+		<Unit filename="../lib/cryptopp/square.cpp" />
+		<Unit filename="../lib/cryptopp/square.h" />
+		<Unit filename="../lib/cryptopp/squaretb.cpp" />
+		<Unit filename="../lib/cryptopp/stdcpp.h" />
+		<Unit filename="../lib/cryptopp/strciphr.cpp" />
+		<Unit filename="../lib/cryptopp/strciphr.h" />
+		<Unit filename="../lib/cryptopp/tea.cpp" />
+		<Unit filename="../lib/cryptopp/tea.h" />
+		<Unit filename="../lib/cryptopp/tiger.cpp" />
+		<Unit filename="../lib/cryptopp/tiger.h" />
+		<Unit filename="../lib/cryptopp/tigertab.cpp" />
+		<Unit filename="../lib/cryptopp/trdlocal.cpp" />
+		<Unit filename="../lib/cryptopp/trdlocal.h" />
+		<Unit filename="../lib/cryptopp/trunhash.h" />
+		<Unit filename="../lib/cryptopp/ttmac.cpp" />
+		<Unit filename="../lib/cryptopp/ttmac.h" />
+		<Unit filename="../lib/cryptopp/vmac.cpp" />
+		<Unit filename="../lib/cryptopp/vmac.h" />
+		<Unit filename="../lib/cryptopp/wait.cpp" />
+		<Unit filename="../lib/cryptopp/wait.h" />
+		<Unit filename="../lib/cryptopp/wake.h" />
+		<Unit filename="../lib/cryptopp/winpipes.cpp" />
+		<Unit filename="../lib/cryptopp/winpipes.h" />
+		<Unit filename="../lib/cryptopp/words.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />

VC2008/GenerateBindings.cmd

@@ -1,3 +1,3 @@
 set ALLTOLUA_WAIT=N
-cd ..\source
+cd ..\src
 AllToLua.bat

VC2008/JsonCpp.cbp

@@ -20,10 +20,10 @@
 					<Add option="-W" />
 					<Add option="-g" />
 					<Add option="-O0" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release Win32">
@@ -39,10 +39,10 @@
 					<Add option="-D_LIB" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release profiled Win32">
@@ -58,20 +58,20 @@
 					<Add option="-D_LIB" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 		</Build>
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_batchallocator.h" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_internalarray.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_internalmap.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_reader.cpp" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_value.cpp" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_valueiterator.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_writer.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_batchallocator.h" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_internalarray.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_internalmap.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_reader.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_value.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_valueiterator.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_writer.cpp" />
 		<Extensions>
 			<code_completion />
 			<envvars />

VC2008/JsonCpp.vcproj

@@ -276,31 +276,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_batchallocator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_internalarray.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_internalmap.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_reader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_value.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_writer.cpp"
 				>
 			</File>
 		</Filter>

VC2008/Lua.cbp

@@ -56,123 +56,123 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../lua-5.1.4/src/lapi.c">
+		<Unit filename="../lib/lua/src/lapi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lapi.h" />
-		<Unit filename="../lua-5.1.4/src/lauxlib.c">
+		<Unit filename="../lib/lua/src/lapi.h" />
+		<Unit filename="../lib/lua/src/lauxlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lauxlib.h" />
-		<Unit filename="../lua-5.1.4/src/lbaselib.c">
+		<Unit filename="../lib/lua/src/lauxlib.h" />
+		<Unit filename="../lib/lua/src/lbaselib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lcode.c">
+		<Unit filename="../lib/lua/src/lcode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lcode.h" />
-		<Unit filename="../lua-5.1.4/src/ldblib.c">
+		<Unit filename="../lib/lua/src/lcode.h" />
+		<Unit filename="../lib/lua/src/ldblib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldebug.c">
+		<Unit filename="../lib/lua/src/ldebug.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldebug.h" />
-		<Unit filename="../lua-5.1.4/src/ldo.c">
+		<Unit filename="../lib/lua/src/ldebug.h" />
+		<Unit filename="../lib/lua/src/ldo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldo.h" />
-		<Unit filename="../lua-5.1.4/src/ldump.c">
+		<Unit filename="../lib/lua/src/ldo.h" />
+		<Unit filename="../lib/lua/src/ldump.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lfunc.c">
+		<Unit filename="../lib/lua/src/lfunc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lfunc.h" />
-		<Unit filename="../lua-5.1.4/src/lgc.c">
+		<Unit filename="../lib/lua/src/lfunc.h" />
+		<Unit filename="../lib/lua/src/lgc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lgc.h" />
-		<Unit filename="../lua-5.1.4/src/linit.c">
+		<Unit filename="../lib/lua/src/lgc.h" />
+		<Unit filename="../lib/lua/src/linit.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/liolib.c">
+		<Unit filename="../lib/lua/src/liolib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/llex.c">
+		<Unit filename="../lib/lua/src/llex.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/llex.h" />
-		<Unit filename="../lua-5.1.4/src/llimits.h" />
-		<Unit filename="../lua-5.1.4/src/lmathlib.c">
+		<Unit filename="../lib/lua/src/llex.h" />
+		<Unit filename="../lib/lua/src/llimits.h" />
+		<Unit filename="../lib/lua/src/lmathlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lmem.c">
+		<Unit filename="../lib/lua/src/lmem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lmem.h" />
-		<Unit filename="../lua-5.1.4/src/loadlib.c">
+		<Unit filename="../lib/lua/src/lmem.h" />
+		<Unit filename="../lib/lua/src/loadlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lobject.c">
+		<Unit filename="../lib/lua/src/lobject.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lobject.h" />
-		<Unit filename="../lua-5.1.4/src/lopcodes.c">
+		<Unit filename="../lib/lua/src/lobject.h" />
+		<Unit filename="../lib/lua/src/lopcodes.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lopcodes.h" />
-		<Unit filename="../lua-5.1.4/src/loslib.c">
+		<Unit filename="../lib/lua/src/lopcodes.h" />
+		<Unit filename="../lib/lua/src/loslib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lparser.c">
+		<Unit filename="../lib/lua/src/lparser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lparser.h" />
-		<Unit filename="../lua-5.1.4/src/lstate.c">
+		<Unit filename="../lib/lua/src/lparser.h" />
+		<Unit filename="../lib/lua/src/lstate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lstate.h" />
-		<Unit filename="../lua-5.1.4/src/lstring.c">
+		<Unit filename="../lib/lua/src/lstate.h" />
+		<Unit filename="../lib/lua/src/lstring.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lstring.h" />
-		<Unit filename="../lua-5.1.4/src/lstrlib.c">
+		<Unit filename="../lib/lua/src/lstring.h" />
+		<Unit filename="../lib/lua/src/lstrlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltable.c">
+		<Unit filename="../lib/lua/src/ltable.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltable.h" />
-		<Unit filename="../lua-5.1.4/src/ltablib.c">
+		<Unit filename="../lib/lua/src/ltable.h" />
+		<Unit filename="../lib/lua/src/ltablib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltm.c">
+		<Unit filename="../lib/lua/src/ltm.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltm.h" />
-		<Unit filename="../lua-5.1.4/src/lua.c">
+		<Unit filename="../lib/lua/src/ltm.h" />
+		<Unit filename="../lib/lua/src/lua.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lua.h" />
-		<Unit filename="../lua-5.1.4/src/luac.c">
+		<Unit filename="../lib/lua/src/lua.h" />
+		<Unit filename="../lib/lua/src/luac.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/luaconf.h" />
-		<Unit filename="../lua-5.1.4/src/lualib.h" />
-		<Unit filename="../lua-5.1.4/src/lundump.c">
+		<Unit filename="../lib/lua/src/luaconf.h" />
+		<Unit filename="../lib/lua/src/lualib.h" />
+		<Unit filename="../lib/lua/src/lundump.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lundump.h" />
-		<Unit filename="../lua-5.1.4/src/lvm.c">
+		<Unit filename="../lib/lua/src/lundump.h" />
+		<Unit filename="../lib/lua/src/lvm.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lvm.h" />
-		<Unit filename="../lua-5.1.4/src/lzio.c">
+		<Unit filename="../lib/lua/src/lvm.h" />
+		<Unit filename="../lib/lua/src/lzio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lzio.h" />
-		<Unit filename="../lua-5.1.4/src/print.c">
+		<Unit filename="../lib/lua/src/lzio.h" />
+		<Unit filename="../lib/lua/src/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>

VC2008/Lua.vcproj

@@ -272,224 +272,224 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\lua-5.1.4\src\lapi.c"
+				RelativePath="..\lib\lua\src\lapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lauxlib.c"
+				RelativePath="..\lib\lua\src\lauxlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lbaselib.c"
+				RelativePath="..\lib\lua\src\lbaselib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lcode.c"
+				RelativePath="..\lib\lua\src\lcode.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldblib.c"
+				RelativePath="..\lib\lua\src\ldblib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldebug.c"
+				RelativePath="..\lib\lua\src\ldebug.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldo.c"
+				RelativePath="..\lib\lua\src\ldo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldump.c"
+				RelativePath="..\lib\lua\src\ldump.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lfunc.c"
+				RelativePath="..\lib\lua\src\lfunc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lgc.c"
+				RelativePath="..\lib\lua\src\lgc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\linit.c"
+				RelativePath="..\lib\lua\src\linit.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\liolib.c"
+				RelativePath="..\lib\lua\src\liolib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\llex.c"
+				RelativePath="..\lib\lua\src\llex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lmathlib.c"
+				RelativePath="..\lib\lua\src\lmathlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lmem.c"
+				RelativePath="..\lib\lua\src\lmem.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\loadlib.c"
+				RelativePath="..\lib\lua\src\loadlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lobject.c"
+				RelativePath="..\lib\lua\src\lobject.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lopcodes.c"
+				RelativePath="..\lib\lua\src\lopcodes.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\loslib.c"
+				RelativePath="..\lib\lua\src\loslib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lparser.c"
+				RelativePath="..\lib\lua\src\lparser.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstate.c"
+				RelativePath="..\lib\lua\src\lstate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstring.c"
+				RelativePath="..\lib\lua\src\lstring.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstrlib.c"
+				RelativePath="..\lib\lua\src\lstrlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltable.c"
+				RelativePath="..\lib\lua\src\ltable.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltablib.c"
+				RelativePath="..\lib\lua\src\ltablib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltm.c"
+				RelativePath="..\lib\lua\src\ltm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lua.c"
+				RelativePath="..\lib\lua\src\lua.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\luac.c"
+				RelativePath="..\lib\lua\src\luac.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lundump.c"
+				RelativePath="..\lib\lua\src\lundump.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lvm.c"
+				RelativePath="..\lib\lua\src\lvm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lzio.c"
+				RelativePath="..\lib\lua\src\lzio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\print.c"
+				RelativePath="..\lib\lua\src\print.c"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\lua-5.1.4\src\lapi.h"
+			RelativePath="..\lib\lua\src\lapi.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lauxlib.h"
+			RelativePath="..\lib\lua\src\lauxlib.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lcode.h"
+			RelativePath="..\lib\lua\src\lcode.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ldebug.h"
+			RelativePath="..\lib\lua\src\ldebug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ldo.h"
+			RelativePath="..\lib\lua\src\ldo.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lfunc.h"
+			RelativePath="..\lib\lua\src\lfunc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lgc.h"
+			RelativePath="..\lib\lua\src\lgc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\llex.h"
+			RelativePath="..\lib\lua\src\llex.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\llimits.h"
+			RelativePath="..\lib\lua\src\llimits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lmem.h"
+			RelativePath="..\lib\lua\src\lmem.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lobject.h"
+			RelativePath="..\lib\lua\src\lobject.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lopcodes.h"
+			RelativePath="..\lib\lua\src\lopcodes.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lparser.h"
+			RelativePath="..\lib\lua\src\lparser.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lstate.h"
+			RelativePath="..\lib\lua\src\lstate.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lstring.h"
+			RelativePath="..\lib\lua\src\lstring.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ltable.h"
+			RelativePath="..\lib\lua\src\ltable.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ltm.h"
+			RelativePath="..\lib\lua\src\ltm.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lua.h"
+			RelativePath="..\lib\lua\src\lua.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\luaconf.h"
+			RelativePath="..\lib\lua\src\luaconf.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lualib.h"
+			RelativePath="..\lib\lua\src\lualib.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lundump.h"
+			RelativePath="..\lib\lua\src\lundump.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lvm.h"
+			RelativePath="..\lib\lua\src\lvm.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lzio.h"
+			RelativePath="..\lib\lua\src\lzio.h"
 			>
 		</File>
 	</Files>

VC2008/MCServer.cbp

@@ -23,9 +23,6 @@
 					<Add directory="../jsoncpp-src-0.5.0/include" />
 					<Add directory="../lua-5.1.4/src" />
 					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
 					<Add directory=".." />
 					<Add directory="../expat" />
 				</Compiler>
@@ -34,9 +31,6 @@
 					<Add directory="../jsoncpp-src-0.5.0/include" />
 					<Add directory="../lua-5.1.4/src" />
 					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
 					<Add directory=".." />
 					<Add directory="../expat" />
 				</ResourceCompiler>
@@ -60,26 +54,20 @@
 					<Add option="-DXML_STATIC" />
 					<Add option="-W" />
 					<Add option="-O3" />
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
@@ -100,26 +88,20 @@
 					<Add option="-DXML_STATIC" />
 					<Add option="-W" />
 					<Add option="-O3" />
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
@@ -130,7 +112,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-fpermissive" />
-			<Add directory="../source" />
+			<Add directory="../src" />
 		</Compiler>
 		<Unit filename="../Android/jni/Android.mk">
 			<Option target="&lt;{~None~}&gt;" />
@@ -191,416 +173,403 @@
 		<Unit filename="../MCServer/terrain.ini" />
 		<Unit filename="../MCServer/users.ini" />
 		<Unit filename="../MCServer/webadmin.ini" />
-		<Unit filename="../iniFile/iniFile.cpp" />
-		<Unit filename="../iniFile/iniFile.h" />
-		<Unit filename="../source/AllToLua.pkg">
+		<Unit filename="../lib/iniFile/iniFile.cpp" />
+		<Unit filename="../lib/iniFile/iniFile.h" />
+		<Unit filename="../src/AllToLua.pkg">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../source/Authenticator.cpp" />
-		<Unit filename="../source/Authenticator.h" />
-		<Unit filename="../source/Bindings.cpp" />
-		<Unit filename="../source/Bindings.h" />
-		<Unit filename="../source/BlockArea.cpp" />
-		<Unit filename="../source/BlockArea.h" />
-		<Unit filename="../source/BlockEntity.h" />
-		<Unit filename="../source/BlockEntityWithItems.h" />
-		<Unit filename="../source/BlockID.cpp" />
-		<Unit filename="../source/BlockID.h" />
-		<Unit filename="../source/Blocks/BlockBed.cpp" />
-		<Unit filename="../source/Blocks/BlockBed.h" />
-		<Unit filename="../source/Blocks/BlockBrewingStand.h" />
-		<Unit filename="../source/Blocks/BlockCactus.h" />
-		<Unit filename="../source/Blocks/BlockCauldron.h" />
-		<Unit filename="../source/Blocks/BlockChest.h" />
-		<Unit filename="../source/Blocks/BlockCloth.h" />
-		<Unit filename="../source/Blocks/BlockCobWeb.h" />
-		<Unit filename="../source/Blocks/BlockCrops.h" />
-		<Unit filename="../source/Blocks/BlockDirt.h" />
-		<Unit filename="../source/Blocks/BlockDispenser.h" />
-		<Unit filename="../source/Blocks/BlockDoor.cpp" />
-		<Unit filename="../source/Blocks/BlockDoor.h" />
-		<Unit filename="../source/Blocks/BlockEnderchest.h" />
-		<Unit filename="../source/Blocks/BlockEntity.h" />
-		<Unit filename="../source/Blocks/BlockFarmland.h" />
-		<Unit filename="../source/Blocks/BlockFenceGate.h" />
-		<Unit filename="../source/Blocks/BlockFire.h" />
-		<Unit filename="../source/Blocks/BlockFlower.h" />
-		<Unit filename="../source/Blocks/BlockFlowerPot.h" />
-		<Unit filename="../source/Blocks/BlockFluid.h" />
-		<Unit filename="../source/Blocks/BlockFurnace.h" />
-		<Unit filename="../source/Blocks/BlockGlass.h" />
-		<Unit filename="../source/Blocks/BlockGlowstone.h" />
-		<Unit filename="../source/Blocks/BlockGravel.h" />
-		<Unit filename="../source/Blocks/BlockHandler.cpp" />
-		<Unit filename="../source/Blocks/BlockHandler.h" />
-		<Unit filename="../source/Blocks/BlockIce.h" />
-		<Unit filename="../source/Blocks/BlockLadder.h" />
-		<Unit filename="../source/Blocks/BlockLeaves.h" />
-		<Unit filename="../source/Blocks/BlockLever.cpp" />
-		<Unit filename="../source/Blocks/BlockLever.h" />
-		<Unit filename="../source/Blocks/BlockMelon.h" />
-		<Unit filename="../source/Blocks/BlockMushroom.h" />
-		<Unit filename="../source/Blocks/BlockMycelium.h" />
-		<Unit filename="../source/Blocks/BlockNote.h" />
-		<Unit filename="../source/Blocks/BlockOre.h" />
-		<Unit filename="../source/Blocks/BlockPiston.cpp" />
-		<Unit filename="../source/Blocks/BlockPiston.h" />
-		<Unit filename="../source/Blocks/BlockRail.h" />
-		<Unit filename="../source/Blocks/BlockRedstone.cpp" />
-		<Unit filename="../source/Blocks/BlockRedstone.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneOre.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneRepeater.cpp" />
-		<Unit filename="../source/Blocks/BlockRedstoneRepeater.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneTorch.h" />
-		<Unit filename="../source/Blocks/BlockSand.h" />
-		<Unit filename="../source/Blocks/BlockSapling.h" />
-		<Unit filename="../source/Blocks/BlockSign.h" />
-		<Unit filename="../source/Blocks/BlockSlab.h" />
-		<Unit filename="../source/Blocks/BlockSnow.h" />
-		<Unit filename="../source/Blocks/BlockStairs.h" />
-		<Unit filename="../source/Blocks/BlockStems.h" />
-		<Unit filename="../source/Blocks/BlockStone.h" />
-		<Unit filename="../source/Blocks/BlockSugarcane.h" />
-		<Unit filename="../source/Blocks/BlockTNT.h" />
-		<Unit filename="../source/Blocks/BlockTallGrass.h" />
-		<Unit filename="../source/Blocks/BlockTorch.h" />
-		<Unit filename="../source/Blocks/BlockVine.h" />
-		<Unit filename="../source/Blocks/BlockWood.h" />
-		<Unit filename="../source/Blocks/BlockWorkbench.h" />
-		<Unit filename="../source/ByteBuffer.cpp" />
-		<Unit filename="../source/ByteBuffer.h" />
-		<Unit filename="../source/ChatColor.cpp" />
-		<Unit filename="../source/ChatColor.h" />
-		<Unit filename="../source/ChestEntity.cpp" />
-		<Unit filename="../source/ChestEntity.h" />
-		<Unit filename="../source/Chunk.cpp" />
-		<Unit filename="../source/Chunk.h" />
-		<Unit filename="../source/Chunk.inl.h" />
-		<Unit filename="../source/ChunkDef.h" />
-		<Unit filename="../source/ChunkMap.cpp" />
-		<Unit filename="../source/ChunkMap.h" />
-		<Unit filename="../source/ChunkSender.cpp" />
-		<Unit filename="../source/ChunkSender.h" />
-		<Unit filename="../source/ClientHandle.cpp" />
-		<Unit filename="../source/ClientHandle.h" />
-		<Unit filename="../source/CraftingRecipes.cpp" />
-		<Unit filename="../source/CraftingRecipes.h" />
-		<Unit filename="../source/Cuboid.cpp" />
-		<Unit filename="../source/Cuboid.h" />
-		<Unit filename="../source/Defines.h" />
-		<Unit filename="../source/DispenserEntity.cpp" />
-		<Unit filename="../source/DispenserEntity.h" />
-		<Unit filename="../source/Doors.h" />
-		<Unit filename="../source/DropperEntity.h" />
-		<Unit filename="../source/Endianness.h" />
-		<Unit filename="../source/Entity.cpp" />
-		<Unit filename="../source/Entity.h" />
-		<Unit filename="../source/FallingBlock.cpp" />
-		<Unit filename="../source/FallingBlock.h" />
-		<Unit filename="../source/FurnaceEntity.cpp" />
-		<Unit filename="../source/FurnaceEntity.h" />
-		<Unit filename="../source/FurnaceRecipe.cpp" />
-		<Unit filename="../source/FurnaceRecipe.h" />
-		<Unit filename="../source/Generating/BioGen.cpp" />
-		<Unit filename="../source/Generating/BioGen.h" />
-		<Unit filename="../source/Generating/Caves.cpp" />
-		<Unit filename="../source/Generating/Caves.h" />
-		<Unit filename="../source/Generating/ChunkDesc.cpp" />
-		<Unit filename="../source/Generating/ChunkDesc.h" />
-		<Unit filename="../source/Generating/ChunkGenerator.cpp" />
-		<Unit filename="../source/Generating/ChunkGenerator.h" />
-		<Unit filename="../source/Generating/CompoGen.cpp" />
-		<Unit filename="../source/Generating/CompoGen.h" />
-		<Unit filename="../source/Generating/ComposableGenerator.cpp" />
-		<Unit filename="../source/Generating/ComposableGenerator.h" />
-		<Unit filename="../source/Generating/DistortedHeightmap.cpp" />
-		<Unit filename="../source/Generating/DistortedHeightmap.h" />
-		<Unit filename="../source/Generating/FinishGen.cpp" />
-		<Unit filename="../source/Generating/FinishGen.h" />
-		<Unit filename="../source/Generating/HeiGen.cpp" />
-		<Unit filename="../source/Generating/HeiGen.h" />
-		<Unit filename="../source/Generating/MineShafts.cpp" />
-		<Unit filename="../source/Generating/MineShafts.h" />
-		<Unit filename="../source/Generating/Noise3DGenerator.cpp" />
-		<Unit filename="../source/Generating/Noise3DGenerator.h" />
-		<Unit filename="../source/Generating/Ravines.cpp" />
-		<Unit filename="../source/Generating/Ravines.h" />
-		<Unit filename="../source/Generating/StructGen.cpp" />
-		<Unit filename="../source/Generating/StructGen.h" />
-		<Unit filename="../source/Generating/Trees.cpp" />
-		<Unit filename="../source/Generating/Trees.h" />
-		<Unit filename="../source/Globals.cpp" />
-		<Unit filename="../source/Globals.h" />
-		<Unit filename="../source/Group.cpp" />
-		<Unit filename="../source/Group.h" />
-		<Unit filename="../source/GroupManager.cpp" />
-		<Unit filename="../source/GroupManager.h" />
-		<Unit filename="../source/Inventory.cpp" />
-		<Unit filename="../source/Inventory.h" />
-		<Unit filename="../source/Item.cpp" />
-		<Unit filename="../source/Item.h" />
-		<Unit filename="../source/ItemGrid.cpp" />
-		<Unit filename="../source/ItemGrid.h" />
-		<Unit filename="../source/Items/ItemBed.h" />
-		<Unit filename="../source/Items/ItemBrewingStand.h" />
-		<Unit filename="../source/Items/ItemBucket.h" />
-		<Unit filename="../source/Items/ItemCauldron.h" />
-		<Unit filename="../source/Items/ItemCloth.h" />
-		<Unit filename="../source/Items/ItemDoor.h" />
-		<Unit filename="../source/Items/ItemDye.h" />
-		<Unit filename="../source/Items/ItemFlowerPot.h" />
-		<Unit filename="../source/Items/ItemFood.h" />
-		<Unit filename="../source/Items/ItemHandler.cpp" />
-		<Unit filename="../source/Items/ItemHandler.h" />
-		<Unit filename="../source/Items/ItemHoe.h" />
-		<Unit filename="../source/Items/ItemLeaves.h" />
-		<Unit filename="../source/Items/ItemLighter.h" />
-		<Unit filename="../source/Items/ItemMinecart.h" />
-		<Unit filename="../source/Items/ItemPickaxe.h" />
-		<Unit filename="../source/Items/ItemRedstoneDust.h" />
-		<Unit filename="../source/Items/ItemRedstoneRepeater.h" />
-		<Unit filename="../source/Items/ItemSapling.h" />
-		<Unit filename="../source/Items/ItemSeeds.h" />
-		<Unit filename="../source/Items/ItemShears.h" />
-		<Unit filename="../source/Items/ItemShovel.h" />
-		<Unit filename="../source/Items/ItemSign.h" />
-		<Unit filename="../source/Items/ItemSlab.h" />
-		<Unit filename="../source/Items/ItemSpawnEgg.h" />
-		<Unit filename="../source/Items/ItemSugarcane.h" />
-		<Unit filename="../source/Items/ItemSword.h" />
-		<Unit filename="../source/Items/ItemWood.h" />
-		<Unit filename="../source/JukeboxEntity.cpp" />
-		<Unit filename="../source/JukeboxEntity.h" />
-		<Unit filename="../source/Ladder.h" />
-		<Unit filename="../source/LeakFinder.h" />
-		<Unit filename="../source/LightingThread.cpp" />
-		<Unit filename="../source/LightingThread.h" />
-		<Unit filename="../source/LinearInterpolation.cpp" />
-		<Unit filename="../source/LinearInterpolation.h" />
-		<Unit filename="../source/LinearUpscale.h" />
-		<Unit filename="../source/Log.cpp" />
-		<Unit filename="../source/Log.h" />
-		<Unit filename="../source/LuaExpat/lxplib.c">
+		<Unit filename="../src/Authenticator.cpp" />
+		<Unit filename="../src/Authenticator.h" />
+		<Unit filename="../src/Bindings.cpp" />
+		<Unit filename="../src/Bindings.h" />
+		<Unit filename="../src/BlockArea.cpp" />
+		<Unit filename="../src/BlockArea.h" />
+		<Unit filename="../src/BlockEntity.h" />
+		<Unit filename="../src/BlockEntityWithItems.h" />
+		<Unit filename="../src/BlockID.cpp" />
+		<Unit filename="../src/BlockID.h" />
+		<Unit filename="../src/Blocks/BlockBed.cpp" />
+		<Unit filename="../src/Blocks/BlockBed.h" />
+		<Unit filename="../src/Blocks/BlockBrewingStand.h" />
+		<Unit filename="../src/Blocks/BlockCactus.h" />
+		<Unit filename="../src/Blocks/BlockCauldron.h" />
+		<Unit filename="../src/Blocks/BlockChest.h" />
+		<Unit filename="../src/Blocks/BlockCloth.h" />
+		<Unit filename="../src/Blocks/BlockCobWeb.h" />
+		<Unit filename="../src/Blocks/BlockCrops.h" />
+		<Unit filename="../src/Blocks/BlockDirt.h" />
+		<Unit filename="../src/Blocks/BlockDispenser.h" />
+		<Unit filename="../src/Blocks/BlockDoor.cpp" />
+		<Unit filename="../src/Blocks/BlockDoor.h" />
+		<Unit filename="../src/Blocks/BlockEnderchest.h" />
+		<Unit filename="../src/Blocks/BlockEntity.h" />
+		<Unit filename="../src/Blocks/BlockFarmland.h" />
+		<Unit filename="../src/Blocks/BlockFenceGate.h" />
+		<Unit filename="../src/Blocks/BlockFire.h" />
+		<Unit filename="../src/Blocks/BlockFlower.h" />
+		<Unit filename="../src/Blocks/BlockFlowerPot.h" />
+		<Unit filename="../src/Blocks/BlockFluid.h" />
+		<Unit filename="../src/Blocks/BlockFurnace.h" />
+		<Unit filename="../src/Blocks/BlockGlass.h" />
+		<Unit filename="../src/Blocks/BlockGlowstone.h" />
+		<Unit filename="../src/Blocks/BlockGravel.h" />
+		<Unit filename="../src/Blocks/BlockHandler.cpp" />
+		<Unit filename="../src/Blocks/BlockHandler.h" />
+		<Unit filename="../src/Blocks/BlockIce.h" />
+		<Unit filename="../src/Blocks/BlockLadder.h" />
+		<Unit filename="../src/Blocks/BlockLeaves.h" />
+		<Unit filename="../src/Blocks/BlockLever.cpp" />
+		<Unit filename="../src/Blocks/BlockLever.h" />
+		<Unit filename="../src/Blocks/BlockMelon.h" />
+		<Unit filename="../src/Blocks/BlockMushroom.h" />
+		<Unit filename="../src/Blocks/BlockMycelium.h" />
+		<Unit filename="../src/Blocks/BlockNote.h" />
+		<Unit filename="../src/Blocks/BlockOre.h" />
+		<Unit filename="../src/Blocks/BlockPiston.cpp" />
+		<Unit filename="../src/Blocks/BlockPiston.h" />
+		<Unit filename="../src/Blocks/BlockRail.h" />
+		<Unit filename="../src/Blocks/BlockRedstone.cpp" />
+		<Unit filename="../src/Blocks/BlockRedstone.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneOre.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneRepeater.cpp" />
+		<Unit filename="../src/Blocks/BlockRedstoneRepeater.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneTorch.h" />
+		<Unit filename="../src/Blocks/BlockSand.h" />
+		<Unit filename="../src/Blocks/BlockSapling.h" />
+		<Unit filename="../src/Blocks/BlockSign.h" />
+		<Unit filename="../src/Blocks/BlockSlab.h" />
+		<Unit filename="../src/Blocks/BlockSnow.h" />
+		<Unit filename="../src/Blocks/BlockStairs.h" />
+		<Unit filename="../src/Blocks/BlockStems.h" />
+		<Unit filename="../src/Blocks/BlockStone.h" />
+		<Unit filename="../src/Blocks/BlockSugarcane.h" />
+		<Unit filename="../src/Blocks/BlockTNT.h" />
+		<Unit filename="../src/Blocks/BlockTallGrass.h" />
+		<Unit filename="../src/Blocks/BlockTorch.h" />
+		<Unit filename="../src/Blocks/BlockVine.h" />
+		<Unit filename="../src/Blocks/BlockWood.h" />
+		<Unit filename="../src/Blocks/BlockWorkbench.h" />
+		<Unit filename="../src/ByteBuffer.cpp" />
+		<Unit filename="../src/ByteBuffer.h" />
+		<Unit filename="../src/ChatColor.cpp" />
+		<Unit filename="../src/ChatColor.h" />
+		<Unit filename="../src/ChestEntity.cpp" />
+		<Unit filename="../src/ChestEntity.h" />
+		<Unit filename="../src/Chunk.cpp" />
+		<Unit filename="../src/Chunk.h" />
+		<Unit filename="../src/Chunk.inl.h" />
+		<Unit filename="../src/ChunkDef.h" />
+		<Unit filename="../src/ChunkMap.cpp" />
+		<Unit filename="../src/ChunkMap.h" />
+		<Unit filename="../src/ChunkSender.cpp" />
+		<Unit filename="../src/ChunkSender.h" />
+		<Unit filename="../src/ClientHandle.cpp" />
+		<Unit filename="../src/ClientHandle.h" />
+		<Unit filename="../src/CraftingRecipes.cpp" />
+		<Unit filename="../src/CraftingRecipes.h" />
+		<Unit filename="../src/Cuboid.cpp" />
+		<Unit filename="../src/Cuboid.h" />
+		<Unit filename="../src/Defines.h" />
+		<Unit filename="../src/DispenserEntity.cpp" />
+		<Unit filename="../src/DispenserEntity.h" />
+		<Unit filename="../src/Doors.h" />
+		<Unit filename="../src/DropperEntity.h" />
+		<Unit filename="../src/Endianness.h" />
+		<Unit filename="../src/Entity.cpp" />
+		<Unit filename="../src/Entity.h" />
+		<Unit filename="../src/FallingBlock.cpp" />
+		<Unit filename="../src/FallingBlock.h" />
+		<Unit filename="../src/FurnaceEntity.cpp" />
+		<Unit filename="../src/FurnaceEntity.h" />
+		<Unit filename="../src/FurnaceRecipe.cpp" />
+		<Unit filename="../src/FurnaceRecipe.h" />
+		<Unit filename="../src/Generating/BioGen.cpp" />
+		<Unit filename="../src/Generating/BioGen.h" />
+		<Unit filename="../src/Generating/Caves.cpp" />
+		<Unit filename="../src/Generating/Caves.h" />
+		<Unit filename="../src/Generating/ChunkDesc.cpp" />
+		<Unit filename="../src/Generating/ChunkDesc.h" />
+		<Unit filename="../src/Generating/ChunkGenerator.cpp" />
+		<Unit filename="../src/Generating/ChunkGenerator.h" />
+		<Unit filename="../src/Generating/CompoGen.cpp" />
+		<Unit filename="../src/Generating/CompoGen.h" />
+		<Unit filename="../src/Generating/ComposableGenerator.cpp" />
+		<Unit filename="../src/Generating/ComposableGenerator.h" />
+		<Unit filename="../src/Generating/DistortedHeightmap.cpp" />
+		<Unit filename="../src/Generating/DistortedHeightmap.h" />
+		<Unit filename="../src/Generating/FinishGen.cpp" />
+		<Unit filename="../src/Generating/FinishGen.h" />
+		<Unit filename="../src/Generating/HeiGen.cpp" />
+		<Unit filename="../src/Generating/HeiGen.h" />
+		<Unit filename="../src/Generating/MineShafts.cpp" />
+		<Unit filename="../src/Generating/MineShafts.h" />
+		<Unit filename="../src/Generating/Noise3DGenerator.cpp" />
+		<Unit filename="../src/Generating/Noise3DGenerator.h" />
+		<Unit filename="../src/Generating/Ravines.cpp" />
+		<Unit filename="../src/Generating/Ravines.h" />
+		<Unit filename="../src/Generating/StructGen.cpp" />
+		<Unit filename="../src/Generating/StructGen.h" />
+		<Unit filename="../src/Generating/Trees.cpp" />
+		<Unit filename="../src/Generating/Trees.h" />
+		<Unit filename="../src/Globals.cpp" />
+		<Unit filename="../src/Globals.h" />
+		<Unit filename="../src/Group.cpp" />
+		<Unit filename="../src/Group.h" />
+		<Unit filename="../src/GroupManager.cpp" />
+		<Unit filename="../src/GroupManager.h" />
+		<Unit filename="../src/Inventory.cpp" />
+		<Unit filename="../src/Inventory.h" />
+		<Unit filename="../src/Item.cpp" />
+		<Unit filename="../src/Item.h" />
+		<Unit filename="../src/ItemGrid.cpp" />
+		<Unit filename="../src/ItemGrid.h" />
+		<Unit filename="../src/Items/ItemBed.h" />
+		<Unit filename="../src/Items/ItemBrewingStand.h" />
+		<Unit filename="../src/Items/ItemBucket.h" />
+		<Unit filename="../src/Items/ItemCauldron.h" />
+		<Unit filename="../src/Items/ItemCloth.h" />
+		<Unit filename="../src/Items/ItemDoor.h" />
+		<Unit filename="../src/Items/ItemDye.h" />
+		<Unit filename="../src/Items/ItemFlowerPot.h" />
+		<Unit filename="../src/Items/ItemFood.h" />
+		<Unit filename="../src/Items/ItemHandler.cpp" />
+		<Unit filename="../src/Items/ItemHandler.h" />
+		<Unit filename="../src/Items/ItemHoe.h" />
+		<Unit filename="../src/Items/ItemLeaves.h" />
+		<Unit filename="../src/Items/ItemLighter.h" />
+		<Unit filename="../src/Items/ItemMinecart.h" />
+		<Unit filename="../src/Items/ItemPickaxe.h" />
+		<Unit filename="../src/Items/ItemRedstoneDust.h" />
+		<Unit filename="../src/Items/ItemRedstoneRepeater.h" />
+		<Unit filename="../src/Items/ItemSapling.h" />
+		<Unit filename="../src/Items/ItemSeeds.h" />
+		<Unit filename="../src/Items/ItemShears.h" />
+		<Unit filename="../src/Items/ItemShovel.h" />
+		<Unit filename="../src/Items/ItemSign.h" />
+		<Unit filename="../src/Items/ItemSlab.h" />
+		<Unit filename="../src/Items/ItemSpawnEgg.h" />
+		<Unit filename="../src/Items/ItemSugarcane.h" />
+		<Unit filename="../src/Items/ItemSword.h" />
+		<Unit filename="../src/Items/ItemWood.h" />
+		<Unit filename="../src/JukeboxEntity.cpp" />
+		<Unit filename="../src/JukeboxEntity.h" />
+		<Unit filename="../src/Ladder.h" />
+		<Unit filename="../src/LeakFinder.h" />
+		<Unit filename="../src/LightingThread.cpp" />
+		<Unit filename="../src/LightingThread.h" />
+		<Unit filename="../src/LinearInterpolation.cpp" />
+		<Unit filename="../src/LinearInterpolation.h" />
+		<Unit filename="../src/LinearUpscale.h" />
+		<Unit filename="../src/Log.cpp" />
+		<Unit filename="../src/Log.h" />
+		<Unit filename="../lib/luaexpat/lxplib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/LuaExpat/lxplib.h" />
-		<Unit filename="../source/LuaFunctions.h" />
-		<Unit filename="../source/MCLogger.cpp" />
-		<Unit filename="../source/MCLogger.h" />
-		<Unit filename="../source/ManualBindings.cpp" />
-		<Unit filename="../source/ManualBindings.h" />
-		<Unit filename="../source/Matrix4f.cpp" />
-		<Unit filename="../source/Matrix4f.h" />
-		<Unit filename="../source/MemoryLeak.h" />
-		<Unit filename="../source/MersenneTwister.h" />
-		<Unit filename="../source/Minecart.cpp" />
-		<Unit filename="../source/Minecart.h" />
-		<Unit filename="../source/Mobs/AggressiveMonster.cpp" />
-		<Unit filename="../source/Mobs/AggressiveMonster.h" />
-		<Unit filename="../source/Mobs/Bat.h" />
-		<Unit filename="../source/Mobs/Blaze.cpp" />
-		<Unit filename="../source/Mobs/Blaze.h" />
-		<Unit filename="../source/Mobs/Cavespider.cpp" />
-		<Unit filename="../source/Mobs/Cavespider.h" />
-		<Unit filename="../source/Mobs/Chicken.cpp" />
-		<Unit filename="../source/Mobs/Chicken.h" />
-		<Unit filename="../source/Mobs/Cow.cpp" />
-		<Unit filename="../source/Mobs/Cow.h" />
-		<Unit filename="../source/Mobs/Creeper.cpp" />
-		<Unit filename="../source/Mobs/Creeper.h" />
-		<Unit filename="../source/Mobs/Enderman.cpp" />
-		<Unit filename="../source/Mobs/Enderman.h" />
-		<Unit filename="../source/Mobs/Ghast.cpp" />
-		<Unit filename="../source/Mobs/Ghast.h" />
-		<Unit filename="../source/Mobs/Magmacube.cpp" />
-		<Unit filename="../source/Mobs/Magmacube.h" />
-		<Unit filename="../source/Mobs/Monster.cpp" />
-		<Unit filename="../source/Mobs/Monster.h" />
-		<Unit filename="../source/Mobs/Mooshroom.cpp" />
-		<Unit filename="../source/Mobs/Mooshroom.h" />
-		<Unit filename="../source/Mobs/Ocelot.h" />
-		<Unit filename="../source/Mobs/PassiveAggressiveMonster.cpp" />
-		<Unit filename="../source/Mobs/PassiveAggressiveMonster.h" />
-		<Unit filename="../source/Mobs/PassiveMonster.cpp" />
-		<Unit filename="../source/Mobs/PassiveMonster.h" />
-		<Unit filename="../source/Mobs/Pig.cpp" />
-		<Unit filename="../source/Mobs/Pig.h" />
-		<Unit filename="../source/Mobs/Sheep.cpp" />
-		<Unit filename="../source/Mobs/Sheep.h" />
-		<Unit filename="../source/Mobs/Silverfish.h" />
-		<Unit filename="../source/Mobs/Skeleton.cpp" />
-		<Unit filename="../source/Mobs/Skeleton.h" />
-		<Unit filename="../source/Mobs/Slime.cpp" />
-		<Unit filename="../source/Mobs/Slime.h" />
-		<Unit filename="../source/Mobs/Spider.cpp" />
-		<Unit filename="../source/Mobs/Spider.h" />
-		<Unit filename="../source/Mobs/Squid.cpp" />
-		<Unit filename="../source/Mobs/Squid.h" />
-		<Unit filename="../source/Mobs/Villager.cpp" />
-		<Unit filename="../source/Mobs/Villager.h" />
-		<Unit filename="../source/Mobs/Witch.cpp" />
-		<Unit filename="../source/Mobs/Witch.h" />
-		<Unit filename="../source/Mobs/Wolf.h" />
-		<Unit filename="../source/Mobs/Zombie.cpp" />
-		<Unit filename="../source/Mobs/Zombie.h" />
-		<Unit filename="../source/Mobs/Zombiepigman.cpp" />
-		<Unit filename="../source/Mobs/Zombiepigman.h" />
-		<Unit filename="../source/MonsterConfig.cpp" />
-		<Unit filename="../source/MonsterConfig.h" />
-		<Unit filename="../source/Noise.cpp" />
-		<Unit filename="../source/Noise.h" />
-		<Unit filename="../source/NoteEntity.cpp" />
-		<Unit filename="../source/NoteEntity.h" />
-		<Unit filename="../source/OSSupport/BlockingTCPLink.cpp" />
-		<Unit filename="../source/OSSupport/BlockingTCPLink.h" />
-		<Unit filename="../source/OSSupport/CriticalSection.cpp" />
-		<Unit filename="../source/OSSupport/CriticalSection.h" />
-		<Unit filename="../source/OSSupport/Event.cpp" />
-		<Unit filename="../source/OSSupport/Event.h" />
-		<Unit filename="../source/OSSupport/File.cpp" />
-		<Unit filename="../source/OSSupport/File.h" />
-		<Unit filename="../source/OSSupport/GZipFile.cpp" />
-		<Unit filename="../source/OSSupport/GZipFile.h" />
-		<Unit filename="../source/OSSupport/IsThread.cpp" />
-		<Unit filename="../source/OSSupport/IsThread.h" />
-		<Unit filename="../source/OSSupport/ListenThread.cpp" />
-		<Unit filename="../source/OSSupport/ListenThread.h" />
-		<Unit filename="../source/OSSupport/MakeDir.cpp" />
-		<Unit filename="../source/OSSupport/MakeDir.h" />
-		<Unit filename="../source/OSSupport/Semaphore.cpp" />
-		<Unit filename="../source/OSSupport/Semaphore.h" />
-		<Unit filename="../source/OSSupport/Sleep.cpp" />
-		<Unit filename="../source/OSSupport/Sleep.h" />
-		<Unit filename="../source/OSSupport/Socket.cpp" />
-		<Unit filename="../source/OSSupport/Socket.h" />
-		<Unit filename="../source/OSSupport/SocketThreads.cpp" />
-		<Unit filename="../source/OSSupport/SocketThreads.h" />
-		<Unit filename="../source/OSSupport/Thread.cpp" />
-		<Unit filename="../source/OSSupport/Thread.h" />
-		<Unit filename="../source/OSSupport/Timer.cpp" />
-		<Unit filename="../source/OSSupport/Timer.h" />
-		<Unit filename="../source/Pawn.cpp" />
-		<Unit filename="../source/Pawn.h" />
-		<Unit filename="../source/Pickup.cpp" />
-		<Unit filename="../source/Pickup.h" />
-		<Unit filename="../source/Piston.cpp" />
-		<Unit filename="../source/Piston.h" />
-		<Unit filename="../source/Player.cpp" />
-		<Unit filename="../source/Player.h" />
-		<Unit filename="../source/Plugin.cpp" />
-		<Unit filename="../source/Plugin.h" />
-		<Unit filename="../source/PluginManager.cpp" />
-		<Unit filename="../source/PluginManager.h" />
-		<Unit filename="../source/Plugin_NewLua.cpp" />
-		<Unit filename="../source/Plugin_NewLua.h" />
-		<Unit filename="../source/Plugin_Squirrel.cpp" />
-		<Unit filename="../source/Plugin_Squirrel.h" />
-		<Unit filename="../source/ProbabDistrib.cpp" />
-		<Unit filename="../source/ProbabDistrib.h" />
-		<Unit filename="../source/Protocol/ChunkDataSerializer.cpp" />
-		<Unit filename="../source/Protocol/ChunkDataSerializer.h" />
-		<Unit filename="../source/Protocol/Protocol.h" />
-		<Unit filename="../source/Protocol/Protocol125.cpp" />
-		<Unit filename="../source/Protocol/Protocol125.h" />
-		<Unit filename="../source/Protocol/Protocol132.cpp" />
-		<Unit filename="../source/Protocol/Protocol132.h" />
-		<Unit filename="../source/Protocol/Protocol14x.cpp" />
-		<Unit filename="../source/Protocol/Protocol14x.h" />
-		<Unit filename="../source/Protocol/Protocol15x.cpp" />
-		<Unit filename="../source/Protocol/Protocol15x.h" />
-		<Unit filename="../source/Protocol/ProtocolRecognizer.cpp" />
-		<Unit filename="../source/Protocol/ProtocolRecognizer.h" />
-		<Unit filename="../source/ReferenceManager.cpp" />
-		<Unit filename="../source/ReferenceManager.h" />
-		<Unit filename="../source/Root.cpp" />
-		<Unit filename="../source/Root.h" />
-		<Unit filename="../source/SQLite/lsqlite3.c">
+		<Unit filename="../lib/luaexpat/lxplib.h" />
+		<Unit filename="../src/LuaFunctions.h" />
+		<Unit filename="../src/MCLogger.cpp" />
+		<Unit filename="../src/MCLogger.h" />
+		<Unit filename="../src/ManualBindings.cpp" />
+		<Unit filename="../src/ManualBindings.h" />
+		<Unit filename="../src/Matrix4f.cpp" />
+		<Unit filename="../src/Matrix4f.h" />
+		<Unit filename="../src/MemoryLeak.h" />
+		<Unit filename="../src/MersenneTwister.h" />
+		<Unit filename="../src/Minecart.cpp" />
+		<Unit filename="../src/Minecart.h" />
+		<Unit filename="../src/Mobs/AggressiveMonster.cpp" />
+		<Unit filename="../src/Mobs/AggressiveMonster.h" />
+		<Unit filename="../src/Mobs/Bat.h" />
+		<Unit filename="../src/Mobs/Blaze.cpp" />
+		<Unit filename="../src/Mobs/Blaze.h" />
+		<Unit filename="../src/Mobs/Cavespider.cpp" />
+		<Unit filename="../src/Mobs/Cavespider.h" />
+		<Unit filename="../src/Mobs/Chicken.cpp" />
+		<Unit filename="../src/Mobs/Chicken.h" />
+		<Unit filename="../src/Mobs/Cow.cpp" />
+		<Unit filename="../src/Mobs/Cow.h" />
+		<Unit filename="../src/Mobs/Creeper.cpp" />
+		<Unit filename="../src/Mobs/Creeper.h" />
+		<Unit filename="../src/Mobs/Enderman.cpp" />
+		<Unit filename="../src/Mobs/Enderman.h" />
+		<Unit filename="../src/Mobs/Ghast.cpp" />
+		<Unit filename="../src/Mobs/Ghast.h" />
+		<Unit filename="../src/Mobs/Magmacube.cpp" />
+		<Unit filename="../src/Mobs/Magmacube.h" />
+		<Unit filename="../src/Mobs/Monster.cpp" />
+		<Unit filename="../src/Mobs/Monster.h" />
+		<Unit filename="../src/Mobs/Mooshroom.cpp" />
+		<Unit filename="../src/Mobs/Mooshroom.h" />
+		<Unit filename="../src/Mobs/Ocelot.h" />
+		<Unit filename="../src/Mobs/PassiveAggressiveMonster.cpp" />
+		<Unit filename="../src/Mobs/PassiveAggressiveMonster.h" />
+		<Unit filename="../src/Mobs/PassiveMonster.cpp" />
+		<Unit filename="../src/Mobs/PassiveMonster.h" />
+		<Unit filename="../src/Mobs/Pig.cpp" />
+		<Unit filename="../src/Mobs/Pig.h" />
+		<Unit filename="../src/Mobs/Sheep.cpp" />
+		<Unit filename="../src/Mobs/Sheep.h" />
+		<Unit filename="../src/Mobs/Silverfish.h" />
+		<Unit filename="../src/Mobs/Skeleton.cpp" />
+		<Unit filename="../src/Mobs/Skeleton.h" />
+		<Unit filename="../src/Mobs/Slime.cpp" />
+		<Unit filename="../src/Mobs/Slime.h" />
+		<Unit filename="../src/Mobs/Spider.cpp" />
+		<Unit filename="../src/Mobs/Spider.h" />
+		<Unit filename="../src/Mobs/Squid.cpp" />
+		<Unit filename="../src/Mobs/Squid.h" />
+		<Unit filename="../src/Mobs/Villager.cpp" />
+		<Unit filename="../src/Mobs/Villager.h" />
+		<Unit filename="../src/Mobs/Witch.cpp" />
+		<Unit filename="../src/Mobs/Witch.h" />
+		<Unit filename="../src/Mobs/Wolf.h" />
+		<Unit filename="../src/Mobs/Zombie.cpp" />
+		<Unit filename="../src/Mobs/Zombie.h" />
+		<Unit filename="../src/Mobs/Zombiepigman.cpp" />
+		<Unit filename="../src/Mobs/Zombiepigman.h" />
+		<Unit filename="../src/MonsterConfig.cpp" />
+		<Unit filename="../src/MonsterConfig.h" />
+		<Unit filename="../src/Noise.cpp" />
+		<Unit filename="../src/Noise.h" />
+		<Unit filename="../src/NoteEntity.cpp" />
+		<Unit filename="../src/NoteEntity.h" />
+		<Unit filename="../src/OSSupport/BlockingTCPLink.cpp" />
+		<Unit filename="../src/OSSupport/BlockingTCPLink.h" />
+		<Unit filename="../src/OSSupport/CriticalSection.cpp" />
+		<Unit filename="../src/OSSupport/CriticalSection.h" />
+		<Unit filename="../src/OSSupport/Event.cpp" />
+		<Unit filename="../src/OSSupport/Event.h" />
+		<Unit filename="../src/OSSupport/File.cpp" />
+		<Unit filename="../src/OSSupport/File.h" />
+		<Unit filename="../src/OSSupport/GZipFile.cpp" />
+		<Unit filename="../src/OSSupport/GZipFile.h" />
+		<Unit filename="../src/OSSupport/IsThread.cpp" />
+		<Unit filename="../src/OSSupport/IsThread.h" />
+		<Unit filename="../src/OSSupport/ListenThread.cpp" />
+		<Unit filename="../src/OSSupport/ListenThread.h" />
+		<Unit filename="../src/OSSupport/MakeDir.cpp" />
+		<Unit filename="../src/OSSupport/MakeDir.h" />
+		<Unit filename="../src/OSSupport/Semaphore.cpp" />
+		<Unit filename="../src/OSSupport/Semaphore.h" />
+		<Unit filename="../src/OSSupport/Sleep.cpp" />
+		<Unit filename="../src/OSSupport/Sleep.h" />
+		<Unit filename="../src/OSSupport/Socket.cpp" />
+		<Unit filename="../src/OSSupport/Socket.h" />
+		<Unit filename="../src/OSSupport/SocketThreads.cpp" />
+		<Unit filename="../src/OSSupport/SocketThreads.h" />
+		<Unit filename="../src/OSSupport/Thread.cpp" />
+		<Unit filename="../src/OSSupport/Thread.h" />
+		<Unit filename="../src/OSSupport/Timer.cpp" />
+		<Unit filename="../src/OSSupport/Timer.h" />
+		<Unit filename="../src/Pawn.cpp" />
+		<Unit filename="../src/Pawn.h" />
+		<Unit filename="../src/Pickup.cpp" />
+		<Unit filename="../src/Pickup.h" />
+		<Unit filename="../src/Piston.cpp" />
+		<Unit filename="../src/Piston.h" />
+		<Unit filename="../src/Player.cpp" />
+		<Unit filename="../src/Player.h" />
+		<Unit filename="../src/Plugin.cpp" />
+		<Unit filename="../src/Plugin.h" />
+		<Unit filename="../src/PluginManager.cpp" />
+		<Unit filename="../src/PluginManager.h" />
+		<Unit filename="../src/ProbabDistrib.cpp" />
+		<Unit filename="../src/ProbabDistrib.h" />
+		<Unit filename="../src/Protocol/ChunkDataSerializer.cpp" />
+		<Unit filename="../src/Protocol/ChunkDataSerializer.h" />
+		<Unit filename="../src/Protocol/Protocol.h" />
+		<Unit filename="../src/Protocol/Protocol125.cpp" />
+		<Unit filename="../src/Protocol/Protocol125.h" />
+		<Unit filename="../src/Protocol/Protocol132.cpp" />
+		<Unit filename="../src/Protocol/Protocol132.h" />
+		<Unit filename="../src/Protocol/Protocol14x.cpp" />
+		<Unit filename="../src/Protocol/Protocol14x.h" />
+		<Unit filename="../src/Protocol/Protocol15x.cpp" />
+		<Unit filename="../src/Protocol/Protocol15x.h" />
+		<Unit filename="../src/Protocol/ProtocolRecognizer.cpp" />
+		<Unit filename="../src/Protocol/ProtocolRecognizer.h" />
+		<Unit filename="../src/ReferenceManager.cpp" />
+		<Unit filename="../src/ReferenceManager.h" />
+		<Unit filename="../src/Root.cpp" />
+		<Unit filename="../src/Root.h" />
+		<Unit filename="../lib/sqlite/lsqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/SQLite/sqlite3.c">
+		<Unit filename="../lib/sqlite/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/SQLite/sqlite3.h" />
-		<Unit filename="../source/SQLite/urls.txt" />
-		<Unit filename="../source/Server.cpp" />
-		<Unit filename="../source/Server.h" />
-		<Unit filename="../source/Sign.h" />
-		<Unit filename="../source/SignEntity.cpp" />
-		<Unit filename="../source/SignEntity.h" />
-		<Unit filename="../source/Simulator/DelayedFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/DelayedFluidSimulator.h" />
-		<Unit filename="../source/Simulator/FireSimulator.cpp" />
-		<Unit filename="../source/Simulator/FireSimulator.h" />
-		<Unit filename="../source/Simulator/FloodyFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/FloodyFluidSimulator.h" />
-		<Unit filename="../source/Simulator/FluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/FluidSimulator.h" />
-		<Unit filename="../source/Simulator/NoopFluidSimulator.h" />
-		<Unit filename="../source/Simulator/RedstoneSimulator.cpp" />
-		<Unit filename="../source/Simulator/RedstoneSimulator.h" />
-		<Unit filename="../source/Simulator/SandSimulator.cpp" />
-		<Unit filename="../source/Simulator/SandSimulator.h" />
-		<Unit filename="../source/Simulator/Simulator.cpp" />
-		<Unit filename="../source/Simulator/Simulator.h" />
-		<Unit filename="../source/Simulator/SimulatorManager.cpp" />
-		<Unit filename="../source/Simulator/SimulatorManager.h" />
-		<Unit filename="../source/Simulator/VaporizeFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/VaporizeFluidSimulator.h" />
-		<Unit filename="../source/SquirrelCommandBinder.cpp" />
-		<Unit filename="../source/SquirrelCommandBinder.h" />
-		<Unit filename="../source/StackWalker.h" />
-		<Unit filename="../source/Stairs.h" />
-		<Unit filename="../source/StringCompression.cpp" />
-		<Unit filename="../source/StringCompression.h" />
-		<Unit filename="../source/StringMap.cpp" />
-		<Unit filename="../source/StringMap.h" />
-		<Unit filename="../source/StringUtils.cpp" />
-		<Unit filename="../source/StringUtils.h" />
-		<Unit filename="../source/TNTEntity.cpp" />
-		<Unit filename="../source/TNTEntity.h" />
-		<Unit filename="../source/Torch.h" />
-		<Unit filename="../source/Tracer.cpp" />
-		<Unit filename="../source/Tracer.h" />
-		<Unit filename="../source/UI/SlotArea.cpp" />
-		<Unit filename="../source/UI/SlotArea.h" />
-		<Unit filename="../source/UI/Window.cpp" />
-		<Unit filename="../source/UI/Window.h" />
-		<Unit filename="../source/UI/WindowOwner.h" />
-		<Unit filename="../source/Vector3d.cpp" />
-		<Unit filename="../source/Vector3d.h" />
-		<Unit filename="../source/Vector3f.cpp" />
-		<Unit filename="../source/Vector3f.h" />
-		<Unit filename="../source/Vector3i.cpp" />
-		<Unit filename="../source/Vector3i.h" />
-		<Unit filename="../source/Vine.h" />
-		<Unit filename="../source/WebAdmin.cpp" />
-		<Unit filename="../source/WebAdmin.h" />
-		<Unit filename="../source/WebPlugin.cpp" />
-		<Unit filename="../source/WebPlugin.h" />
-		<Unit filename="../source/World.cpp" />
-		<Unit filename="../source/World.h" />
-		<Unit filename="../source/WorldStorage/FastNBT.cpp" />
-		<Unit filename="../source/WorldStorage/FastNBT.h" />
-		<Unit filename="../source/WorldStorage/NBTChunkSerializer.cpp" />
-		<Unit filename="../source/WorldStorage/NBTChunkSerializer.h" />
-		<Unit filename="../source/WorldStorage/WSSAnvil.cpp" />
-		<Unit filename="../source/WorldStorage/WSSAnvil.h" />
-		<Unit filename="../source/WorldStorage/WSSCompact.cpp" />
-		<Unit filename="../source/WorldStorage/WSSCompact.h" />
-		<Unit filename="../source/WorldStorage/WorldStorage.cpp" />
-		<Unit filename="../source/WorldStorage/WorldStorage.h" />
-		<Unit filename="../source/main.cpp" />
-		<Unit filename="../source/md5/md5.cpp" />
-		<Unit filename="../source/md5/md5.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelArray.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelBaseClass.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelBindings.cpp" />
-		<Unit filename="../source/squirrelbindings/SquirrelBindings.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelFunctions.cpp" />
-		<Unit filename="../source/squirrelbindings/SquirrelFunctions.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelObject.h" />
-		<Unit filename="../source/tolua++.h" />
-		<Unit filename="../source/tolua_base.h" />
+		<Unit filename="../lib/sqlite/sqlite3.h" />
+		<Unit filename="../lib/sqlite/urls.txt" />
+		<Unit filename="../src/Server.cpp" />
+		<Unit filename="../src/Server.h" />
+		<Unit filename="../src/Sign.h" />
+		<Unit filename="../src/SignEntity.cpp" />
+		<Unit filename="../src/SignEntity.h" />
+		<Unit filename="../src/Simulator/DelayedFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/DelayedFluidSimulator.h" />
+		<Unit filename="../src/Simulator/FireSimulator.cpp" />
+		<Unit filename="../src/Simulator/FireSimulator.h" />
+		<Unit filename="../src/Simulator/FloodyFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/FloodyFluidSimulator.h" />
+		<Unit filename="../src/Simulator/FluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/FluidSimulator.h" />
+		<Unit filename="../src/Simulator/NoopFluidSimulator.h" />
+		<Unit filename="../src/Simulator/RedstoneSimulator.cpp" />
+		<Unit filename="../src/Simulator/RedstoneSimulator.h" />
+		<Unit filename="../src/Simulator/SandSimulator.cpp" />
+		<Unit filename="../src/Simulator/SandSimulator.h" />
+		<Unit filename="../src/Simulator/Simulator.cpp" />
+		<Unit filename="../src/Simulator/Simulator.h" />
+		<Unit filename="../src/Simulator/SimulatorManager.cpp" />
+		<Unit filename="../src/Simulator/SimulatorManager.h" />
+		<Unit filename="../src/Simulator/VaporizeFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/VaporizeFluidSimulator.h" />
+		<Unit filename="../src/StackWalker.h" />
+		<Unit filename="../src/Stairs.h" />
+		<Unit filename="../src/StringCompression.cpp" />
+		<Unit filename="../src/StringCompression.h" />
+		<Unit filename="../src/StringMap.cpp" />
+		<Unit filename="../src/StringMap.h" />
+		<Unit filename="../src/StringUtils.cpp" />
+		<Unit filename="../src/StringUtils.h" />
+		<Unit filename="../src/TNTEntity.cpp" />
+		<Unit filename="../src/TNTEntity.h" />
+		<Unit filename="../src/Torch.h" />
+		<Unit filename="../src/Tracer.cpp" />
+		<Unit filename="../src/Tracer.h" />
+		<Unit filename="../src/UI/SlotArea.cpp" />
+		<Unit filename="../src/UI/SlotArea.h" />
+		<Unit filename="../src/UI/Window.cpp" />
+		<Unit filename="../src/UI/Window.h" />
+		<Unit filename="../src/UI/WindowOwner.h" />
+		<Unit filename="../src/Vector3d.cpp" />
+		<Unit filename="../src/Vector3d.h" />
+		<Unit filename="../src/Vector3f.cpp" />
+		<Unit filename="../src/Vector3f.h" />
+		<Unit filename="../src/Vector3i.cpp" />
+		<Unit filename="../src/Vector3i.h" />
+		<Unit filename="../src/Vine.h" />
+		<Unit filename="../src/WebAdmin.cpp" />
+		<Unit filename="../src/WebAdmin.h" />
+		<Unit filename="../src/WebPlugin.cpp" />
+		<Unit filename="../src/WebPlugin.h" />
+		<Unit filename="../src/World.cpp" />
+		<Unit filename="../src/World.h" />
+		<Unit filename="../src/WorldStorage/FastNBT.cpp" />
+		<Unit filename="../src/WorldStorage/FastNBT.h" />
+		<Unit filename="../src/WorldStorage/NBTChunkSerializer.cpp" />
+		<Unit filename="../src/WorldStorage/NBTChunkSerializer.h" />
+		<Unit filename="../src/WorldStorage/WSSAnvil.cpp" />
+		<Unit filename="../src/WorldStorage/WSSAnvil.h" />
+		<Unit filename="../src/WorldStorage/WSSCompact.cpp" />
+		<Unit filename="../src/WorldStorage/WSSCompact.h" />
+		<Unit filename="../src/WorldStorage/WorldStorage.cpp" />
+		<Unit filename="../src/WorldStorage/WorldStorage.h" />
+		<Unit filename="../src/main.cpp" />
+		<Unit filename="../lib/md5/md5.cpp" />
+		<Unit filename="../lib/md5/md5.h" />
+		<Unit filename="../src/tolua++.h" />
+		<Unit filename="../src/tolua_base.h" />
 		<Unit filename="../webadmin/template.html" />
 		<Unit filename="MCServer.rc">
 			<Option compilerVar="WINDRES" />

VC2008/ToLua.cbp

@@ -21,12 +21,12 @@
 					<Add option="-W" />
 					<Add option="-g" />
 					<Add option="-O0" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release Win32">
@@ -43,12 +43,12 @@
 					<Add option="-D_CRT_SECURE_NO_WARNINGS" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release profiled Win32">
@@ -65,32 +65,32 @@
 					<Add option="-D_CRT_SECURE_NO_WARNINGS" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../lua-5.1.4/src" />
+					<Add directory="../lib/tolua++/include" />
+					<Add directory="../lib/lua/src" />
 				</ResourceCompiler>
 			</Target>
 		</Build>
-		<Unit filename="../tolua++-1.0.93/src/bin/tolua.c">
+		<Unit filename="../lib/tolua++/src/bin/tolua.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_event.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_event.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_event.h" />
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_is.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_event.h" />
+		<Unit filename="../lib/tolua++/src/lib/tolua_is.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_map.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_push.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_push.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_to.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_to.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>

VC2008/ToLua.vcproj

@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src"
+				AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src"
+				AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -168,7 +168,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src"
+				AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../tolua++-1.0.93/include;../lua-5.1.4/src"
+				AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -276,31 +276,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\bin\tolua.c"
+				RelativePath="..\lib\tolua++\src\bin\tolua.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_event.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_event.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_event.h"
+				RelativePath="..\lib\tolua++\src\lib\tolua_event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_is.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_is.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_map.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_map.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_push.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_push.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_to.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_to.c"
 				>
 			</File>
 		</Filter>

VC2008/expat.cbp

@@ -40,32 +40,32 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../expat/ascii.h" />
-		<Unit filename="../expat/asciitab.h" />
-		<Unit filename="../expat/expat.h" />
-		<Unit filename="../expat/expat_external.h" />
-		<Unit filename="../expat/iasciitab.h" />
-		<Unit filename="../expat/internal.h" />
-		<Unit filename="../expat/latin1tab.h" />
-		<Unit filename="../expat/nametab.h" />
-		<Unit filename="../expat/utf8tab.h" />
-		<Unit filename="../expat/winconfig.h" />
-		<Unit filename="../expat/xmlparse.c">
+		<Unit filename="../lib/expat/ascii.h" />
+		<Unit filename="../lib/expat/asciitab.h" />
+		<Unit filename="../lib/expat/expat.h" />
+		<Unit filename="../lib/expat/expat_external.h" />
+		<Unit filename="../lib/expat/iasciitab.h" />
+		<Unit filename="../lib/expat/internal.h" />
+		<Unit filename="../lib/expat/latin1tab.h" />
+		<Unit filename="../lib/expat/nametab.h" />
+		<Unit filename="../lib/expat/utf8tab.h" />
+		<Unit filename="../lib/expat/winconfig.h" />
+		<Unit filename="../lib/expat/xmlparse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmlrole.c">
+		<Unit filename="../lib/expat/xmlrole.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmlrole.h" />
-		<Unit filename="../expat/xmltok.c">
+		<Unit filename="../lib/expat/xmlrole.h" />
+		<Unit filename="../lib/expat/xmltok.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmltok.h" />
-		<Unit filename="../expat/xmltok_impl.c">
+		<Unit filename="../lib/expat/xmltok.h" />
+		<Unit filename="../lib/expat/xmltok_impl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmltok_impl.h" />
-		<Unit filename="../expat/xmltok_ns.c">
+		<Unit filename="../lib/expat/xmltok_impl.h" />
+		<Unit filename="../lib/expat/xmltok_ns.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>

VC2008/expat.vcproj

@@ -149,75 +149,75 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\expat\ascii.h"
+				RelativePath="..\lib\expat\ascii.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\asciitab.h"
+				RelativePath="..\lib\expat\asciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\expat.h"
+				RelativePath="..\lib\expat\expat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\expat_external.h"
+				RelativePath="..\lib\expat\expat_external.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\iasciitab.h"
+				RelativePath="..\lib\expat\iasciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\internal.h"
+				RelativePath="..\lib\expat\internal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\latin1tab.h"
+				RelativePath="..\lib\expat\latin1tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\nametab.h"
+				RelativePath="..\lib\expat\nametab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\utf8tab.h"
+				RelativePath="..\lib\expat\utf8tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\winconfig.h"
+				RelativePath="..\lib\expat\winconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlparse.c"
+				RelativePath="..\lib\expat\xmlparse.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlrole.c"
+				RelativePath="..\lib\expat\xmlrole.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlrole.h"
+				RelativePath="..\lib\expat\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok.c"
+				RelativePath="..\lib\expat\xmltok.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok.h"
+				RelativePath="..\lib\expat\xmltok.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_impl.c"
+				RelativePath="..\lib\expat\xmltok_impl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_impl.h"
+				RelativePath="..\lib\expat\xmltok_impl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_ns.c"
+				RelativePath="..\lib\expat\xmltok_ns.c"
 				>
 			</File>
 		</Filter>

VC2008/zlib.cbp

@@ -56,62 +56,62 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../zlib-1.2.7/adler32.c">
+		<Unit filename="../lib/zlib/adler32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/compress.c">
+		<Unit filename="../lib/zlib/compress.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/crc32.c">
+		<Unit filename="../lib/zlib/crc32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/crc32.h" />
-		<Unit filename="../zlib-1.2.7/deflate.c">
+		<Unit filename="../lib/zlib/crc32.h" />
+		<Unit filename="../lib/zlib/deflate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/deflate.h" />
-		<Unit filename="../zlib-1.2.7/gzclose.c">
+		<Unit filename="../lib/zlib/deflate.h" />
+		<Unit filename="../lib/zlib/gzclose.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzguts.h" />
-		<Unit filename="../zlib-1.2.7/gzlib.c">
+		<Unit filename="../lib/zlib/gzguts.h" />
+		<Unit filename="../lib/zlib/gzlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzread.c">
+		<Unit filename="../lib/zlib/gzread.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzwrite.c">
+		<Unit filename="../lib/zlib/gzwrite.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/infback.c">
+		<Unit filename="../lib/zlib/infback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inffast.c">
+		<Unit filename="../lib/zlib/inffast.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inffast.h" />
-		<Unit filename="../zlib-1.2.7/inffixed.h" />
-		<Unit filename="../zlib-1.2.7/inflate.c">
+		<Unit filename="../lib/zlib/inffast.h" />
+		<Unit filename="../lib/zlib/inffixed.h" />
+		<Unit filename="../lib/zlib/inflate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inflate.h" />
-		<Unit filename="../zlib-1.2.7/inftrees.c">
+		<Unit filename="../lib/zlib/inflate.h" />
+		<Unit filename="../lib/zlib/inftrees.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inftrees.h" />
-		<Unit filename="../zlib-1.2.7/trees.c">
+		<Unit filename="../lib/zlib/inftrees.h" />
+		<Unit filename="../lib/zlib/trees.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/trees.h" />
-		<Unit filename="../zlib-1.2.7/uncompr.c">
+		<Unit filename="../lib/zlib/trees.h" />
+		<Unit filename="../lib/zlib/uncompr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/zconf.h" />
-		<Unit filename="../zlib-1.2.7/zlib.h" />
-		<Unit filename="../zlib-1.2.7/zutil.c">
+		<Unit filename="../lib/zlib/zconf.h" />
+		<Unit filename="../lib/zlib/zlib.h" />
+		<Unit filename="../lib/zlib/zutil.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/zutil.h" />
+		<Unit filename="../lib/zlib/zutil.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />

VC2008/zlib.vcproj

@@ -276,107 +276,107 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\zlib-1.2.7\adler32.c"
+				RelativePath="..\lib\zlib\adler32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\compress.c"
+				RelativePath="..\lib\zlib\compress.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\crc32.c"
+				RelativePath="..\lib\zlib\crc32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\crc32.h"
+				RelativePath="..\lib\zlib\crc32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\deflate.c"
+				RelativePath="..\lib\zlib\deflate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\deflate.h"
+				RelativePath="..\lib\zlib\deflate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzclose.c"
+				RelativePath="..\lib\zlib\gzclose.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzguts.h"
+				RelativePath="..\lib\zlib\gzguts.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzlib.c"
+				RelativePath="..\lib\zlib\gzlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzread.c"
+				RelativePath="..\lib\zlib\gzread.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzwrite.c"
+				RelativePath="..\lib\zlib\gzwrite.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\infback.c"
+				RelativePath="..\lib\zlib\infback.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffast.c"
+				RelativePath="..\lib\zlib\inffast.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffast.h"
+				RelativePath="..\lib\zlib\inffast.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffixed.h"
+				RelativePath="..\lib\zlib\inffixed.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inflate.c"
+				RelativePath="..\lib\zlib\inflate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inflate.h"
+				RelativePath="..\lib\zlib\inflate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inftrees.c"
+				RelativePath="..\lib\zlib\inftrees.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inftrees.h"
+				RelativePath="..\lib\zlib\inftrees.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\trees.c"
+				RelativePath="..\lib\zlib\trees.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\trees.h"
+				RelativePath="..\lib\zlib\trees.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\uncompr.c"
+				RelativePath="..\lib\zlib\uncompr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zconf.h"
+				RelativePath="..\lib\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zlib.h"
+				RelativePath="..\lib\zlib\zlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zutil.c"
+				RelativePath="..\lib\zlib\zutil.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zutil.h"
+				RelativePath="..\lib\zlib\zutil.h"
 				>
 			</File>
 		</Filter>

VC2013/.gitignore

@@ -8,3 +8,4 @@ ipch/**
 *.suo
 *.obj
 *.sdf
+*.opensdf

VC2013/CryptoPP.vcxproj

@@ -289,97 +289,97 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\CryptoPP\adler32.cpp">
+    <ClCompile Include="..\lib\cryptopp\adler32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algebra.cpp">
+    <ClCompile Include="..\lib\cryptopp\algebra.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algparam.cpp">
+    <ClCompile Include="..\lib\cryptopp\algparam.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\asn.cpp">
+    <ClCompile Include="..\lib\cryptopp\asn.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\authenc.cpp" />
-    <ClCompile Include="..\CryptoPP\base32.cpp">
+    <ClCompile Include="..\lib\cryptopp\authenc.cpp" />
+    <ClCompile Include="..\lib\cryptopp\base32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base64.cpp">
+    <ClCompile Include="..\lib\cryptopp\base64.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\basecode.cpp">
+    <ClCompile Include="..\lib\cryptopp\basecode.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cbcmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cbcmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ccm.cpp" />
-    <ClCompile Include="..\CryptoPP\channels.cpp">
+    <ClCompile Include="..\lib\cryptopp\ccm.cpp" />
+    <ClCompile Include="..\lib\cryptopp\channels.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cmac.cpp" />
-    <ClCompile Include="..\CryptoPP\cpu.cpp" />
-    <ClCompile Include="..\CryptoPP\crc.cpp">
+    <ClCompile Include="..\lib\cryptopp\cmac.cpp" />
+    <ClCompile Include="..\lib\cryptopp\cpu.cpp" />
+    <ClCompile Include="..\lib\cryptopp\crc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cryptlib.cpp">
+    <ClCompile Include="..\lib\cryptopp\cryptlib.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\default.cpp">
+    <ClCompile Include="..\lib\cryptopp\default.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\des.cpp" />
-    <ClCompile Include="..\CryptoPP\dessp.cpp" />
-    <ClCompile Include="..\CryptoPP\dh.cpp">
+    <ClCompile Include="..\lib\cryptopp\des.cpp" />
+    <ClCompile Include="..\lib\cryptopp\dessp.cpp" />
+    <ClCompile Include="..\lib\cryptopp\dh.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh2.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dll.cpp">
+    <ClCompile Include="..\lib\cryptopp\dll.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">
       </PrecompiledHeader>
@@ -397,20 +397,20 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\dsa.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eax.cpp" />
-    <ClCompile Include="..\CryptoPP\ec2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\eax.cpp" />
+    <ClCompile Include="..\lib\cryptopp\ec2n.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eccrypto.cpp">
+    <ClCompile Include="..\lib\cryptopp\eccrypto.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">true</ExcludedFromBuild>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">true</ExcludedFromBuild>
@@ -422,20 +422,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ecp.cpp">
+    <ClCompile Include="..\lib\cryptopp\ecp.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\elgamal.cpp">
+    <ClCompile Include="..\lib\cryptopp\elgamal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\emsa2.cpp" />
-    <ClCompile Include="..\CryptoPP\eprecomp.cpp">
+    <ClCompile Include="..\lib\cryptopp\emsa2.cpp" />
+    <ClCompile Include="..\lib\cryptopp\eprecomp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">true</ExcludedFromBuild>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">true</ExcludedFromBuild>
@@ -447,74 +447,74 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\esign.cpp">
+    <ClCompile Include="..\lib\cryptopp\esign.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\files.cpp">
+    <ClCompile Include="..\lib\cryptopp\files.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\filters.cpp">
+    <ClCompile Include="..\lib\cryptopp\filters.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\fips140.cpp">
+    <ClCompile Include="..\lib\cryptopp\fips140.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gcm.cpp" />
-    <ClCompile Include="..\CryptoPP\gf256.cpp">
+    <ClCompile Include="..\lib\cryptopp\gcm.cpp" />
+    <ClCompile Include="..\lib\cryptopp\gf256.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2_32.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2_32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2n.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gfpcrypt.cpp">
+    <ClCompile Include="..\lib\cryptopp\gfpcrypt.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hex.cpp">
+    <ClCompile Include="..\lib\cryptopp\hex.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\hmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hrtimer.cpp">
+    <ClCompile Include="..\lib\cryptopp\hrtimer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\integer.cpp">
+    <ClCompile Include="..\lib\cryptopp\integer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -522,7 +522,7 @@
       <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </AssemblerListingLocation>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\iterhash.cpp">
+    <ClCompile Include="..\lib\cryptopp\iterhash.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">
       </PrecompiledHeader>
@@ -540,79 +540,79 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\luc.cpp">
+    <ClCompile Include="..\lib\cryptopp\luc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md2.cpp">
+    <ClCompile Include="..\lib\cryptopp\md2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md4.cpp">
+    <ClCompile Include="..\lib\cryptopp\md4.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md5.cpp">
+    <ClCompile Include="..\lib\cryptopp\md5.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\misc.cpp">
+    <ClCompile Include="..\lib\cryptopp\misc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\modes.cpp">
+    <ClCompile Include="..\lib\cryptopp\modes.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqueue.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqueue.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqv.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqv.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\nbtheory.cpp">
+    <ClCompile Include="..\lib\cryptopp\nbtheory.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\network.cpp">
+    <ClCompile Include="..\lib\cryptopp\network.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\oaep.cpp">
+    <ClCompile Include="..\lib\cryptopp\oaep.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\osrng.cpp">
+    <ClCompile Include="..\lib\cryptopp\osrng.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pch.cpp">
+    <ClCompile Include="..\lib\cryptopp\pch.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Create</PrecompiledHeader>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
@@ -624,166 +624,166 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pkcspad.cpp">
+    <ClCompile Include="..\lib\cryptopp\pkcspad.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\polynomi.cpp">
+    <ClCompile Include="..\lib\cryptopp\polynomi.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pssr.cpp" />
-    <ClCompile Include="..\CryptoPP\pubkey.cpp">
+    <ClCompile Include="..\lib\cryptopp\pssr.cpp" />
+    <ClCompile Include="..\lib\cryptopp\pubkey.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\queue.cpp">
+    <ClCompile Include="..\lib\cryptopp\queue.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rabin.cpp">
+    <ClCompile Include="..\lib\cryptopp\rabin.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\randpool.cpp">
+    <ClCompile Include="..\lib\cryptopp\randpool.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rdtables.cpp">
+    <ClCompile Include="..\lib\cryptopp\rdtables.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rijndael.cpp">
+    <ClCompile Include="..\lib\cryptopp\rijndael.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rng.cpp">
+    <ClCompile Include="..\lib\cryptopp\rng.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\rsa.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rw.cpp">
+    <ClCompile Include="..\lib\cryptopp\rw.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\safer.cpp">
+    <ClCompile Include="..\lib\cryptopp\safer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seal.cpp">
+    <ClCompile Include="..\lib\cryptopp\seal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seed.cpp" />
-    <ClCompile Include="..\CryptoPP\sha.cpp">
+    <ClCompile Include="..\lib\cryptopp\seed.cpp" />
+    <ClCompile Include="..\lib\cryptopp\sha.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\shacal2.cpp">
+    <ClCompile Include="..\lib\cryptopp\shacal2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\simple.cpp">
+    <ClCompile Include="..\lib\cryptopp\simple.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\socketft.cpp">
+    <ClCompile Include="..\lib\cryptopp\socketft.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\square.cpp">
+    <ClCompile Include="..\lib\cryptopp\square.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\squaretb.cpp">
+    <ClCompile Include="..\lib\cryptopp\squaretb.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\strciphr.cpp">
+    <ClCompile Include="..\lib\cryptopp\strciphr.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tea.cpp">
+    <ClCompile Include="..\lib\cryptopp\tea.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tiger.cpp">
+    <ClCompile Include="..\lib\cryptopp\tiger.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tigertab.cpp">
+    <ClCompile Include="..\lib\cryptopp\tigertab.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\trdlocal.cpp">
+    <ClCompile Include="..\lib\cryptopp\trdlocal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ttmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\ttmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\vmac.cpp" />
-    <ClCompile Include="..\CryptoPP\wait.cpp">
+    <ClCompile Include="..\lib\cryptopp\vmac.cpp" />
+    <ClCompile Include="..\lib\cryptopp\wait.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\winpipes.cpp">
+    <ClCompile Include="..\lib\cryptopp\winpipes.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -791,116 +791,116 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CryptoPP\adler32.h" />
-    <ClInclude Include="..\CryptoPP\aes.h" />
-    <ClInclude Include="..\CryptoPP\algebra.h" />
-    <ClInclude Include="..\CryptoPP\algparam.h" />
-    <ClInclude Include="..\CryptoPP\arc4.h" />
-    <ClInclude Include="..\CryptoPP\argnames.h" />
-    <ClInclude Include="..\CryptoPP\asn.h" />
-    <ClInclude Include="..\CryptoPP\authenc.h" />
-    <ClInclude Include="..\CryptoPP\base32.h" />
-    <ClInclude Include="..\CryptoPP\base64.h" />
-    <ClInclude Include="..\CryptoPP\basecode.h" />
-    <ClInclude Include="..\CryptoPP\cbcmac.h" />
-    <ClInclude Include="..\CryptoPP\ccm.h" />
-    <ClInclude Include="..\CryptoPP\channels.h" />
-    <ClInclude Include="..\CryptoPP\cmac.h" />
-    <ClInclude Include="..\CryptoPP\config.h" />
-    <ClInclude Include="..\CryptoPP\cpu.h" />
-    <ClInclude Include="..\CryptoPP\crc.h" />
-    <ClInclude Include="..\CryptoPP\cryptlib.h" />
-    <ClInclude Include="..\CryptoPP\default.h" />
-    <ClInclude Include="..\CryptoPP\des.h" />
-    <ClInclude Include="..\CryptoPP\dh.h" />
-    <ClInclude Include="..\CryptoPP\dh2.h" />
-    <ClInclude Include="..\CryptoPP\dmac.h" />
-    <ClInclude Include="..\CryptoPP\dsa.h" />
-    <ClInclude Include="..\CryptoPP\eax.h" />
-    <ClInclude Include="..\CryptoPP\ec2n.h" />
-    <ClInclude Include="..\CryptoPP\eccrypto.h" />
-    <ClInclude Include="..\CryptoPP\ecp.h" />
-    <ClInclude Include="..\CryptoPP\elgamal.h" />
-    <ClInclude Include="..\CryptoPP\emsa2.h" />
-    <ClInclude Include="..\CryptoPP\eprecomp.h" />
-    <ClInclude Include="..\CryptoPP\esign.h" />
-    <ClInclude Include="..\CryptoPP\files.h" />
-    <ClInclude Include="..\CryptoPP\filters.h" />
-    <ClInclude Include="..\CryptoPP\fips140.h" />
-    <ClInclude Include="..\CryptoPP\fltrimpl.h" />
-    <ClInclude Include="..\CryptoPP\gcm.h" />
-    <ClInclude Include="..\CryptoPP\gf256.h" />
-    <ClInclude Include="..\CryptoPP\gf2_32.h" />
-    <ClInclude Include="..\CryptoPP\gf2n.h" />
-    <ClInclude Include="..\CryptoPP\gfpcrypt.h" />
-    <ClInclude Include="..\CryptoPP\gzip.h" />
-    <ClInclude Include="..\CryptoPP\hex.h" />
-    <ClInclude Include="..\CryptoPP\hmac.h" />
-    <ClInclude Include="..\CryptoPP\hrtimer.h" />
-    <ClInclude Include="..\CryptoPP\integer.h" />
-    <ClInclude Include="..\CryptoPP\iterhash.h" />
-    <ClInclude Include="..\CryptoPP\lubyrack.h" />
-    <ClInclude Include="..\CryptoPP\luc.h" />
-    <ClInclude Include="..\CryptoPP\md2.h" />
-    <ClInclude Include="..\CryptoPP\md4.h" />
-    <ClInclude Include="..\CryptoPP\md5.h" />
-    <ClInclude Include="..\CryptoPP\mdc.h" />
-    <ClInclude Include="..\CryptoPP\misc.h" />
-    <ClInclude Include="..\CryptoPP\modarith.h" />
-    <ClInclude Include="..\CryptoPP\modes.h" />
-    <ClInclude Include="..\CryptoPP\modexppc.h" />
-    <ClInclude Include="..\CryptoPP\mqueue.h" />
-    <ClInclude Include="..\CryptoPP\mqv.h" />
-    <ClInclude Include="..\CryptoPP\nbtheory.h" />
-    <ClInclude Include="..\CryptoPP\network.h" />
-    <ClInclude Include="..\CryptoPP\nr.h" />
-    <ClInclude Include="..\CryptoPP\oaep.h" />
-    <ClInclude Include="..\CryptoPP\oids.h" />
-    <ClInclude Include="..\CryptoPP\osrng.h" />
-    <ClInclude Include="..\CryptoPP\pch.h" />
-    <ClInclude Include="..\CryptoPP\pkcspad.h" />
-    <ClInclude Include="..\CryptoPP\polynomi.h" />
-    <ClInclude Include="..\CryptoPP\pssr.h" />
-    <ClInclude Include="..\CryptoPP\pubkey.h" />
-    <ClInclude Include="..\CryptoPP\pwdbased.h" />
-    <ClInclude Include="..\CryptoPP\queue.h" />
-    <ClInclude Include="..\CryptoPP\rabin.h" />
-    <ClInclude Include="..\CryptoPP\randpool.h" />
-    <ClInclude Include="..\CryptoPP\rijndael.h" />
-    <ClInclude Include="..\CryptoPP\rng.h" />
-    <ClInclude Include="..\CryptoPP\rsa.h" />
-    <ClInclude Include="..\CryptoPP\rw.h" />
-    <ClInclude Include="..\CryptoPP\safer.h" />
-    <ClInclude Include="..\CryptoPP\seal.h" />
-    <ClInclude Include="..\CryptoPP\secblock.h" />
-    <ClInclude Include="..\CryptoPP\seckey.h" />
-    <ClInclude Include="..\CryptoPP\seed.h" />
-    <ClInclude Include="..\CryptoPP\sha.h" />
-    <ClInclude Include="..\CryptoPP\shacal2.h" />
-    <ClInclude Include="..\CryptoPP\simple.h" />
-    <ClInclude Include="..\CryptoPP\smartptr.h" />
-    <ClInclude Include="..\CryptoPP\socketft.h" />
-    <ClInclude Include="..\CryptoPP\square.h" />
-    <ClInclude Include="..\CryptoPP\stdcpp.h" />
-    <ClInclude Include="..\CryptoPP\strciphr.h" />
-    <ClInclude Include="..\CryptoPP\tea.h" />
-    <ClInclude Include="..\CryptoPP\tiger.h" />
-    <ClInclude Include="..\CryptoPP\trdlocal.h" />
-    <ClInclude Include="..\CryptoPP\trunhash.h" />
-    <ClInclude Include="..\CryptoPP\ttmac.h" />
-    <ClInclude Include="..\CryptoPP\vmac.h" />
-    <ClInclude Include="..\CryptoPP\wait.h" />
-    <ClInclude Include="..\CryptoPP\wake.h" />
-    <ClInclude Include="..\CryptoPP\winpipes.h" />
-    <ClInclude Include="..\CryptoPP\words.h" />
+    <ClInclude Include="..\lib\cryptopp\adler32.h" />
+    <ClInclude Include="..\lib\cryptopp\aes.h" />
+    <ClInclude Include="..\lib\cryptopp\algebra.h" />
+    <ClInclude Include="..\lib\cryptopp\algparam.h" />
+    <ClInclude Include="..\lib\cryptopp\arc4.h" />
+    <ClInclude Include="..\lib\cryptopp\argnames.h" />
+    <ClInclude Include="..\lib\cryptopp\asn.h" />
+    <ClInclude Include="..\lib\cryptopp\authenc.h" />
+    <ClInclude Include="..\lib\cryptopp\base32.h" />
+    <ClInclude Include="..\lib\cryptopp\base64.h" />
+    <ClInclude Include="..\lib\cryptopp\basecode.h" />
+    <ClInclude Include="..\lib\cryptopp\cbcmac.h" />
+    <ClInclude Include="..\lib\cryptopp\ccm.h" />
+    <ClInclude Include="..\lib\cryptopp\channels.h" />
+    <ClInclude Include="..\lib\cryptopp\cmac.h" />
+    <ClInclude Include="..\lib\cryptopp\config.h" />
+    <ClInclude Include="..\lib\cryptopp\cpu.h" />
+    <ClInclude Include="..\lib\cryptopp\crc.h" />
+    <ClInclude Include="..\lib\cryptopp\cryptlib.h" />
+    <ClInclude Include="..\lib\cryptopp\default.h" />
+    <ClInclude Include="..\lib\cryptopp\des.h" />
+    <ClInclude Include="..\lib\cryptopp\dh.h" />
+    <ClInclude Include="..\lib\cryptopp\dh2.h" />
+    <ClInclude Include="..\lib\cryptopp\dmac.h" />
+    <ClInclude Include="..\lib\cryptopp\dsa.h" />
+    <ClInclude Include="..\lib\cryptopp\eax.h" />
+    <ClInclude Include="..\lib\cryptopp\ec2n.h" />
+    <ClInclude Include="..\lib\cryptopp\eccrypto.h" />
+    <ClInclude Include="..\lib\cryptopp\ecp.h" />
+    <ClInclude Include="..\lib\cryptopp\elgamal.h" />
+    <ClInclude Include="..\lib\cryptopp\emsa2.h" />
+    <ClInclude Include="..\lib\cryptopp\eprecomp.h" />
+    <ClInclude Include="..\lib\cryptopp\esign.h" />
+    <ClInclude Include="..\lib\cryptopp\files.h" />
+    <ClInclude Include="..\lib\cryptopp\filters.h" />
+    <ClInclude Include="..\lib\cryptopp\fips140.h" />
+    <ClInclude Include="..\lib\cryptopp\fltrimpl.h" />
+    <ClInclude Include="..\lib\cryptopp\gcm.h" />
+    <ClInclude Include="..\lib\cryptopp\gf256.h" />
+    <ClInclude Include="..\lib\cryptopp\gf2_32.h" />
+    <ClInclude Include="..\lib\cryptopp\gf2n.h" />
+    <ClInclude Include="..\lib\cryptopp\gfpcrypt.h" />
+    <ClInclude Include="..\lib\cryptopp\gzip.h" />
+    <ClInclude Include="..\lib\cryptopp\hex.h" />
+    <ClInclude Include="..\lib\cryptopp\hmac.h" />
+    <ClInclude Include="..\lib\cryptopp\hrtimer.h" />
+    <ClInclude Include="..\lib\cryptopp\integer.h" />
+    <ClInclude Include="..\lib\cryptopp\iterhash.h" />
+    <ClInclude Include="..\lib\cryptopp\lubyrack.h" />
+    <ClInclude Include="..\lib\cryptopp\luc.h" />
+    <ClInclude Include="..\lib\cryptopp\md2.h" />
+    <ClInclude Include="..\lib\cryptopp\md4.h" />
+    <ClInclude Include="..\lib\cryptopp\md5.h" />
+    <ClInclude Include="..\lib\cryptopp\mdc.h" />
+    <ClInclude Include="..\lib\cryptopp\misc.h" />
+    <ClInclude Include="..\lib\cryptopp\modarith.h" />
+    <ClInclude Include="..\lib\cryptopp\modes.h" />
+    <ClInclude Include="..\lib\cryptopp\modexppc.h" />
+    <ClInclude Include="..\lib\cryptopp\mqueue.h" />
+    <ClInclude Include="..\lib\cryptopp\mqv.h" />
+    <ClInclude Include="..\lib\cryptopp\nbtheory.h" />
+    <ClInclude Include="..\lib\cryptopp\network.h" />
+    <ClInclude Include="..\lib\cryptopp\nr.h" />
+    <ClInclude Include="..\lib\cryptopp\oaep.h" />
+    <ClInclude Include="..\lib\cryptopp\oids.h" />
+    <ClInclude Include="..\lib\cryptopp\osrng.h" />
+    <ClInclude Include="..\lib\cryptopp\pch.h" />
+    <ClInclude Include="..\lib\cryptopp\pkcspad.h" />
+    <ClInclude Include="..\lib\cryptopp\polynomi.h" />
+    <ClInclude Include="..\lib\cryptopp\pssr.h" />
+    <ClInclude Include="..\lib\cryptopp\pubkey.h" />
+    <ClInclude Include="..\lib\cryptopp\pwdbased.h" />
+    <ClInclude Include="..\lib\cryptopp\queue.h" />
+    <ClInclude Include="..\lib\cryptopp\rabin.h" />
+    <ClInclude Include="..\lib\cryptopp\randpool.h" />
+    <ClInclude Include="..\lib\cryptopp\rijndael.h" />
+    <ClInclude Include="..\lib\cryptopp\rng.h" />
+    <ClInclude Include="..\lib\cryptopp\rsa.h" />
+    <ClInclude Include="..\lib\cryptopp\rw.h" />
+    <ClInclude Include="..\lib\cryptopp\safer.h" />
+    <ClInclude Include="..\lib\cryptopp\seal.h" />
+    <ClInclude Include="..\lib\cryptopp\secblock.h" />
+    <ClInclude Include="..\lib\cryptopp\seckey.h" />
+    <ClInclude Include="..\lib\cryptopp\seed.h" />
+    <ClInclude Include="..\lib\cryptopp\sha.h" />
+    <ClInclude Include="..\lib\cryptopp\shacal2.h" />
+    <ClInclude Include="..\lib\cryptopp\simple.h" />
+    <ClInclude Include="..\lib\cryptopp\smartptr.h" />
+    <ClInclude Include="..\lib\cryptopp\socketft.h" />
+    <ClInclude Include="..\lib\cryptopp\square.h" />
+    <ClInclude Include="..\lib\cryptopp\stdcpp.h" />
+    <ClInclude Include="..\lib\cryptopp\strciphr.h" />
+    <ClInclude Include="..\lib\cryptopp\tea.h" />
+    <ClInclude Include="..\lib\cryptopp\tiger.h" />
+    <ClInclude Include="..\lib\cryptopp\trdlocal.h" />
+    <ClInclude Include="..\lib\cryptopp\trunhash.h" />
+    <ClInclude Include="..\lib\cryptopp\ttmac.h" />
+    <ClInclude Include="..\lib\cryptopp\vmac.h" />
+    <ClInclude Include="..\lib\cryptopp\wait.h" />
+    <ClInclude Include="..\lib\cryptopp\wake.h" />
+    <ClInclude Include="..\lib\cryptopp\winpipes.h" />
+    <ClInclude Include="..\lib\cryptopp\words.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CryptoPP\Doxyfile" />
-    <None Include="..\CryptoPP\GNUmakefile" />
+    <None Include="..\lib\cryptopp\Doxyfile" />
+    <None Include="..\lib\cryptopp\GNUmakefile" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\CryptoPP\License.txt" />
-    <Text Include="..\CryptoPP\Readme.txt" />
+    <Text Include="..\lib\cryptopp\License.txt" />
+    <Text Include="..\lib\cryptopp\Readme.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/CryptoPP.vcxproj.filters

@@ -2,598 +2,598 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{66d19353-af6a-4f52-9546-f52f44dd13cc}</UniqueIdentifier>
+      <UniqueIdentifier>{21031ece-70f0-4aa6-9069-6947175663ea}</UniqueIdentifier>
       <Extensions>.cpp</Extensions>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{512ceb0e-67f5-47b1-b19b-59352a5e0785}</UniqueIdentifier>
+      <UniqueIdentifier>{20dd9259-32b4-4f5b-9af8-c689a12627ec}</UniqueIdentifier>
       <Extensions>.;.h</Extensions>
     </Filter>
     <Filter Include="Miscellaneous">
-      <UniqueIdentifier>{b7c7d4fa-281f-482d-be38-d8106878975c}</UniqueIdentifier>
+      <UniqueIdentifier>{9a225122-4fcd-43c9-868a-6caf0dd272ce}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CryptoPP\adler32.cpp">
+    <ClCompile Include="..\lib\cryptopp\adler32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algebra.cpp">
+    <ClCompile Include="..\lib\cryptopp\algebra.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algparam.cpp">
+    <ClCompile Include="..\lib\cryptopp\algparam.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\asn.cpp">
+    <ClCompile Include="..\lib\cryptopp\asn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\authenc.cpp">
+    <ClCompile Include="..\lib\cryptopp\authenc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base32.cpp">
+    <ClCompile Include="..\lib\cryptopp\base32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base64.cpp">
+    <ClCompile Include="..\lib\cryptopp\base64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\basecode.cpp">
+    <ClCompile Include="..\lib\cryptopp\basecode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cbcmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cbcmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ccm.cpp">
+    <ClCompile Include="..\lib\cryptopp\ccm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\channels.cpp">
+    <ClCompile Include="..\lib\cryptopp\channels.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cpu.cpp">
+    <ClCompile Include="..\lib\cryptopp\cpu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\crc.cpp">
+    <ClCompile Include="..\lib\cryptopp\crc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cryptlib.cpp">
+    <ClCompile Include="..\lib\cryptopp\cryptlib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\default.cpp">
+    <ClCompile Include="..\lib\cryptopp\default.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\des.cpp">
+    <ClCompile Include="..\lib\cryptopp\des.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dessp.cpp">
+    <ClCompile Include="..\lib\cryptopp\dessp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh2.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dll.cpp">
+    <ClCompile Include="..\lib\cryptopp\dll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\dsa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eax.cpp">
+    <ClCompile Include="..\lib\cryptopp\eax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ec2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\ec2n.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eccrypto.cpp">
+    <ClCompile Include="..\lib\cryptopp\eccrypto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ecp.cpp">
+    <ClCompile Include="..\lib\cryptopp\ecp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\elgamal.cpp">
+    <ClCompile Include="..\lib\cryptopp\elgamal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\emsa2.cpp">
+    <ClCompile Include="..\lib\cryptopp\emsa2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eprecomp.cpp">
+    <ClCompile Include="..\lib\cryptopp\eprecomp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\esign.cpp">
+    <ClCompile Include="..\lib\cryptopp\esign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\files.cpp">
+    <ClCompile Include="..\lib\cryptopp\files.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\filters.cpp">
+    <ClCompile Include="..\lib\cryptopp\filters.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\fips140.cpp">
+    <ClCompile Include="..\lib\cryptopp\fips140.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gcm.cpp">
+    <ClCompile Include="..\lib\cryptopp\gcm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf256.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf256.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2_32.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2_32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2n.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gfpcrypt.cpp">
+    <ClCompile Include="..\lib\cryptopp\gfpcrypt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hex.cpp">
+    <ClCompile Include="..\lib\cryptopp\hex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\hmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hrtimer.cpp">
+    <ClCompile Include="..\lib\cryptopp\hrtimer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\integer.cpp">
+    <ClCompile Include="..\lib\cryptopp\integer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\iterhash.cpp">
+    <ClCompile Include="..\lib\cryptopp\iterhash.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\luc.cpp">
+    <ClCompile Include="..\lib\cryptopp\luc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md2.cpp">
+    <ClCompile Include="..\lib\cryptopp\md2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md4.cpp">
+    <ClCompile Include="..\lib\cryptopp\md4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md5.cpp">
+    <ClCompile Include="..\lib\cryptopp\md5.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\misc.cpp">
+    <ClCompile Include="..\lib\cryptopp\misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\modes.cpp">
+    <ClCompile Include="..\lib\cryptopp\modes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqueue.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqv.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqv.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\nbtheory.cpp">
+    <ClCompile Include="..\lib\cryptopp\nbtheory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\network.cpp">
+    <ClCompile Include="..\lib\cryptopp\network.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\oaep.cpp">
+    <ClCompile Include="..\lib\cryptopp\oaep.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\osrng.cpp">
+    <ClCompile Include="..\lib\cryptopp\osrng.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pch.cpp">
+    <ClCompile Include="..\lib\cryptopp\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pkcspad.cpp">
+    <ClCompile Include="..\lib\cryptopp\pkcspad.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\polynomi.cpp">
+    <ClCompile Include="..\lib\cryptopp\polynomi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pssr.cpp">
+    <ClCompile Include="..\lib\cryptopp\pssr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pubkey.cpp">
+    <ClCompile Include="..\lib\cryptopp\pubkey.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\queue.cpp">
+    <ClCompile Include="..\lib\cryptopp\queue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rabin.cpp">
+    <ClCompile Include="..\lib\cryptopp\rabin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\randpool.cpp">
+    <ClCompile Include="..\lib\cryptopp\randpool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rdtables.cpp">
+    <ClCompile Include="..\lib\cryptopp\rdtables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rijndael.cpp">
+    <ClCompile Include="..\lib\cryptopp\rijndael.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rng.cpp">
+    <ClCompile Include="..\lib\cryptopp\rng.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\rsa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rw.cpp">
+    <ClCompile Include="..\lib\cryptopp\rw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\safer.cpp">
+    <ClCompile Include="..\lib\cryptopp\safer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seal.cpp">
+    <ClCompile Include="..\lib\cryptopp\seal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seed.cpp">
+    <ClCompile Include="..\lib\cryptopp\seed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\sha.cpp">
+    <ClCompile Include="..\lib\cryptopp\sha.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\shacal2.cpp">
+    <ClCompile Include="..\lib\cryptopp\shacal2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\simple.cpp">
+    <ClCompile Include="..\lib\cryptopp\simple.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\socketft.cpp">
+    <ClCompile Include="..\lib\cryptopp\socketft.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\square.cpp">
+    <ClCompile Include="..\lib\cryptopp\square.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\squaretb.cpp">
+    <ClCompile Include="..\lib\cryptopp\squaretb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\strciphr.cpp">
+    <ClCompile Include="..\lib\cryptopp\strciphr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tea.cpp">
+    <ClCompile Include="..\lib\cryptopp\tea.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tiger.cpp">
+    <ClCompile Include="..\lib\cryptopp\tiger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tigertab.cpp">
+    <ClCompile Include="..\lib\cryptopp\tigertab.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\trdlocal.cpp">
+    <ClCompile Include="..\lib\cryptopp\trdlocal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ttmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\ttmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\vmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\vmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\wait.cpp">
+    <ClCompile Include="..\lib\cryptopp\wait.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\winpipes.cpp">
+    <ClCompile Include="..\lib\cryptopp\winpipes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CryptoPP\adler32.h">
+    <ClInclude Include="..\lib\cryptopp\adler32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\aes.h">
+    <ClInclude Include="..\lib\cryptopp\aes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\algebra.h">
+    <ClInclude Include="..\lib\cryptopp\algebra.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\algparam.h">
+    <ClInclude Include="..\lib\cryptopp\algparam.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\arc4.h">
+    <ClInclude Include="..\lib\cryptopp\arc4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\argnames.h">
+    <ClInclude Include="..\lib\cryptopp\argnames.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\asn.h">
+    <ClInclude Include="..\lib\cryptopp\asn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\authenc.h">
+    <ClInclude Include="..\lib\cryptopp\authenc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\base32.h">
+    <ClInclude Include="..\lib\cryptopp\base32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\base64.h">
+    <ClInclude Include="..\lib\cryptopp\base64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\basecode.h">
+    <ClInclude Include="..\lib\cryptopp\basecode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cbcmac.h">
+    <ClInclude Include="..\lib\cryptopp\cbcmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ccm.h">
+    <ClInclude Include="..\lib\cryptopp\ccm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\channels.h">
+    <ClInclude Include="..\lib\cryptopp\channels.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cmac.h">
+    <ClInclude Include="..\lib\cryptopp\cmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\config.h">
+    <ClInclude Include="..\lib\cryptopp\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cpu.h">
+    <ClInclude Include="..\lib\cryptopp\cpu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\crc.h">
+    <ClInclude Include="..\lib\cryptopp\crc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cryptlib.h">
+    <ClInclude Include="..\lib\cryptopp\cryptlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\default.h">
+    <ClInclude Include="..\lib\cryptopp\default.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\des.h">
+    <ClInclude Include="..\lib\cryptopp\des.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dh.h">
+    <ClInclude Include="..\lib\cryptopp\dh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dh2.h">
+    <ClInclude Include="..\lib\cryptopp\dh2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dmac.h">
+    <ClInclude Include="..\lib\cryptopp\dmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dsa.h">
+    <ClInclude Include="..\lib\cryptopp\dsa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eax.h">
+    <ClInclude Include="..\lib\cryptopp\eax.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ec2n.h">
+    <ClInclude Include="..\lib\cryptopp\ec2n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eccrypto.h">
+    <ClInclude Include="..\lib\cryptopp\eccrypto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ecp.h">
+    <ClInclude Include="..\lib\cryptopp\ecp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\elgamal.h">
+    <ClInclude Include="..\lib\cryptopp\elgamal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\emsa2.h">
+    <ClInclude Include="..\lib\cryptopp\emsa2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eprecomp.h">
+    <ClInclude Include="..\lib\cryptopp\eprecomp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\esign.h">
+    <ClInclude Include="..\lib\cryptopp\esign.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\files.h">
+    <ClInclude Include="..\lib\cryptopp\files.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\filters.h">
+    <ClInclude Include="..\lib\cryptopp\filters.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\fips140.h">
+    <ClInclude Include="..\lib\cryptopp\fips140.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\fltrimpl.h">
+    <ClInclude Include="..\lib\cryptopp\fltrimpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gcm.h">
+    <ClInclude Include="..\lib\cryptopp\gcm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf256.h">
+    <ClInclude Include="..\lib\cryptopp\gf256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf2_32.h">
+    <ClInclude Include="..\lib\cryptopp\gf2_32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf2n.h">
+    <ClInclude Include="..\lib\cryptopp\gf2n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gfpcrypt.h">
+    <ClInclude Include="..\lib\cryptopp\gfpcrypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gzip.h">
+    <ClInclude Include="..\lib\cryptopp\gzip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hex.h">
+    <ClInclude Include="..\lib\cryptopp\hex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hmac.h">
+    <ClInclude Include="..\lib\cryptopp\hmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hrtimer.h">
+    <ClInclude Include="..\lib\cryptopp\hrtimer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\integer.h">
+    <ClInclude Include="..\lib\cryptopp\integer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\iterhash.h">
+    <ClInclude Include="..\lib\cryptopp\iterhash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\lubyrack.h">
+    <ClInclude Include="..\lib\cryptopp\lubyrack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\luc.h">
+    <ClInclude Include="..\lib\cryptopp\luc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md2.h">
+    <ClInclude Include="..\lib\cryptopp\md2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md4.h">
+    <ClInclude Include="..\lib\cryptopp\md4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md5.h">
+    <ClInclude Include="..\lib\cryptopp\md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mdc.h">
+    <ClInclude Include="..\lib\cryptopp\mdc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\misc.h">
+    <ClInclude Include="..\lib\cryptopp\misc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modarith.h">
+    <ClInclude Include="..\lib\cryptopp\modarith.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modes.h">
+    <ClInclude Include="..\lib\cryptopp\modes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modexppc.h">
+    <ClInclude Include="..\lib\cryptopp\modexppc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mqueue.h">
+    <ClInclude Include="..\lib\cryptopp\mqueue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mqv.h">
+    <ClInclude Include="..\lib\cryptopp\mqv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\nbtheory.h">
+    <ClInclude Include="..\lib\cryptopp\nbtheory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\network.h">
+    <ClInclude Include="..\lib\cryptopp\network.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\nr.h">
+    <ClInclude Include="..\lib\cryptopp\nr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\oaep.h">
+    <ClInclude Include="..\lib\cryptopp\oaep.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\oids.h">
+    <ClInclude Include="..\lib\cryptopp\oids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\osrng.h">
+    <ClInclude Include="..\lib\cryptopp\osrng.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pch.h">
+    <ClInclude Include="..\lib\cryptopp\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pkcspad.h">
+    <ClInclude Include="..\lib\cryptopp\pkcspad.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\polynomi.h">
+    <ClInclude Include="..\lib\cryptopp\polynomi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pssr.h">
+    <ClInclude Include="..\lib\cryptopp\pssr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pubkey.h">
+    <ClInclude Include="..\lib\cryptopp\pubkey.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pwdbased.h">
+    <ClInclude Include="..\lib\cryptopp\pwdbased.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\queue.h">
+    <ClInclude Include="..\lib\cryptopp\queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rabin.h">
+    <ClInclude Include="..\lib\cryptopp\rabin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\randpool.h">
+    <ClInclude Include="..\lib\cryptopp\randpool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rijndael.h">
+    <ClInclude Include="..\lib\cryptopp\rijndael.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rng.h">
+    <ClInclude Include="..\lib\cryptopp\rng.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rsa.h">
+    <ClInclude Include="..\lib\cryptopp\rsa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rw.h">
+    <ClInclude Include="..\lib\cryptopp\rw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\safer.h">
+    <ClInclude Include="..\lib\cryptopp\safer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seal.h">
+    <ClInclude Include="..\lib\cryptopp\seal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\secblock.h">
+    <ClInclude Include="..\lib\cryptopp\secblock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seckey.h">
+    <ClInclude Include="..\lib\cryptopp\seckey.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seed.h">
+    <ClInclude Include="..\lib\cryptopp\seed.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\sha.h">
+    <ClInclude Include="..\lib\cryptopp\sha.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\shacal2.h">
+    <ClInclude Include="..\lib\cryptopp\shacal2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\simple.h">
+    <ClInclude Include="..\lib\cryptopp\simple.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\smartptr.h">
+    <ClInclude Include="..\lib\cryptopp\smartptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\socketft.h">
+    <ClInclude Include="..\lib\cryptopp\socketft.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\square.h">
+    <ClInclude Include="..\lib\cryptopp\square.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\stdcpp.h">
+    <ClInclude Include="..\lib\cryptopp\stdcpp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\strciphr.h">
+    <ClInclude Include="..\lib\cryptopp\strciphr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\tea.h">
+    <ClInclude Include="..\lib\cryptopp\tea.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\tiger.h">
+    <ClInclude Include="..\lib\cryptopp\tiger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\trdlocal.h">
+    <ClInclude Include="..\lib\cryptopp\trdlocal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\trunhash.h">
+    <ClInclude Include="..\lib\cryptopp\trunhash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ttmac.h">
+    <ClInclude Include="..\lib\cryptopp\ttmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\vmac.h">
+    <ClInclude Include="..\lib\cryptopp\vmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\wait.h">
+    <ClInclude Include="..\lib\cryptopp\wait.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\wake.h">
+    <ClInclude Include="..\lib\cryptopp\wake.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\winpipes.h">
+    <ClInclude Include="..\lib\cryptopp\winpipes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\words.h">
+    <ClInclude Include="..\lib\cryptopp\words.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CryptoPP\Doxyfile">
+    <None Include="..\lib\cryptopp\Doxyfile">
       <Filter>Miscellaneous</Filter>
     </None>
-    <None Include="..\CryptoPP\GNUmakefile">
+    <None Include="..\lib\cryptopp\GNUmakefile">
       <Filter>Miscellaneous</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\CryptoPP\License.txt">
+    <Text Include="..\lib\cryptopp\License.txt">
       <Filter>Miscellaneous</Filter>
     </Text>
-    <Text Include="..\CryptoPP\Readme.txt">
+    <Text Include="..\lib\cryptopp\Readme.txt">
       <Filter>Miscellaneous</Filter>
     </Text>
   </ItemGroup>

VC2013/GenerateBindings.cmd

@@ -0,0 +1,3 @@
+set ALLTOLUA_WAIT=N
+cd ..\src
+AllToLua.bat

VC2013/JsonCpp.vcxproj

@@ -134,17 +134,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h" />
+    <ClInclude Include="..\lib\jsoncpp\src\lib_json\json_batchallocator.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl" />
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl" />
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalarray.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalmap.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp" />
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp" />
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_reader.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_value.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_writer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/JsonCpp.vcxproj.filters

@@ -7,29 +7,29 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h">
+    <ClInclude Include="..\lib\jsoncpp\src\lib_json\json_batchallocator.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalarray.inl">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalmap.inl">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_reader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_value.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_writer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

VC2013/Lua.vcxproj

@@ -130,63 +130,63 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\lua-5.1.4\src\lapi.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lauxlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lbaselib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lcode.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldblib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldebug.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldo.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldump.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lfunc.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lgc.c" />
-    <ClCompile Include="..\lua-5.1.4\src\linit.c" />
-    <ClCompile Include="..\lua-5.1.4\src\liolib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\llex.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lmathlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lmem.c" />
-    <ClCompile Include="..\lua-5.1.4\src\loadlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lobject.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lopcodes.c" />
-    <ClCompile Include="..\lua-5.1.4\src\loslib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lparser.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstate.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstring.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstrlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltable.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltablib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltm.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lua.c" />
-    <ClCompile Include="..\lua-5.1.4\src\luac.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lundump.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lvm.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lzio.c" />
-    <ClCompile Include="..\lua-5.1.4\src\print.c" />
+    <ClCompile Include="..\lib\lua\src\lapi.c" />
+    <ClCompile Include="..\lib\lua\src\lauxlib.c" />
+    <ClCompile Include="..\lib\lua\src\lbaselib.c" />
+    <ClCompile Include="..\lib\lua\src\lcode.c" />
+    <ClCompile Include="..\lib\lua\src\ldblib.c" />
+    <ClCompile Include="..\lib\lua\src\ldebug.c" />
+    <ClCompile Include="..\lib\lua\src\ldo.c" />
+    <ClCompile Include="..\lib\lua\src\ldump.c" />
+    <ClCompile Include="..\lib\lua\src\lfunc.c" />
+    <ClCompile Include="..\lib\lua\src\lgc.c" />
+    <ClCompile Include="..\lib\lua\src\linit.c" />
+    <ClCompile Include="..\lib\lua\src\liolib.c" />
+    <ClCompile Include="..\lib\lua\src\llex.c" />
+    <ClCompile Include="..\lib\lua\src\lmathlib.c" />
+    <ClCompile Include="..\lib\lua\src\lmem.c" />
+    <ClCompile Include="..\lib\lua\src\loadlib.c" />
+    <ClCompile Include="..\lib\lua\src\lobject.c" />
+    <ClCompile Include="..\lib\lua\src\lopcodes.c" />
+    <ClCompile Include="..\lib\lua\src\loslib.c" />
+    <ClCompile Include="..\lib\lua\src\lparser.c" />
+    <ClCompile Include="..\lib\lua\src\lstate.c" />
+    <ClCompile Include="..\lib\lua\src\lstring.c" />
+    <ClCompile Include="..\lib\lua\src\lstrlib.c" />
+    <ClCompile Include="..\lib\lua\src\ltable.c" />
+    <ClCompile Include="..\lib\lua\src\ltablib.c" />
+    <ClCompile Include="..\lib\lua\src\ltm.c" />
+    <ClCompile Include="..\lib\lua\src\lua.c" />
+    <ClCompile Include="..\lib\lua\src\luac.c" />
+    <ClCompile Include="..\lib\lua\src\lundump.c" />
+    <ClCompile Include="..\lib\lua\src\lvm.c" />
+    <ClCompile Include="..\lib\lua\src\lzio.c" />
+    <ClCompile Include="..\lib\lua\src\print.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lua-5.1.4\src\lapi.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lauxlib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lcode.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldebug.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldo.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lfunc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lgc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llex.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llimits.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lmem.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lobject.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lopcodes.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lparser.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstate.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstring.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltable.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lua.h" />
-    <ClInclude Include="..\lua-5.1.4\src\luaconf.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lualib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lundump.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lvm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lzio.h" />
+    <ClInclude Include="..\lib\lua\src\lapi.h" />
+    <ClInclude Include="..\lib\lua\src\lauxlib.h" />
+    <ClInclude Include="..\lib\lua\src\lcode.h" />
+    <ClInclude Include="..\lib\lua\src\ldebug.h" />
+    <ClInclude Include="..\lib\lua\src\ldo.h" />
+    <ClInclude Include="..\lib\lua\src\lfunc.h" />
+    <ClInclude Include="..\lib\lua\src\lgc.h" />
+    <ClInclude Include="..\lib\lua\src\llex.h" />
+    <ClInclude Include="..\lib\lua\src\llimits.h" />
+    <ClInclude Include="..\lib\lua\src\lmem.h" />
+    <ClInclude Include="..\lib\lua\src\lobject.h" />
+    <ClInclude Include="..\lib\lua\src\lopcodes.h" />
+    <ClInclude Include="..\lib\lua\src\lparser.h" />
+    <ClInclude Include="..\lib\lua\src\lstate.h" />
+    <ClInclude Include="..\lib\lua\src\lstring.h" />
+    <ClInclude Include="..\lib\lua\src\ltable.h" />
+    <ClInclude Include="..\lib\lua\src\ltm.h" />
+    <ClInclude Include="..\lib\lua\src\lua.h" />
+    <ClInclude Include="..\lib\lua\src\luaconf.h" />
+    <ClInclude Include="..\lib\lua\src\lualib.h" />
+    <ClInclude Include="..\lib\lua\src\lundump.h" />
+    <ClInclude Include="..\lib\lua\src\lvm.h" />
+    <ClInclude Include="..\lib\lua\src\lzio.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/Lua.vcxproj.filters

@@ -7,126 +7,126 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\lua-5.1.4\src\lapi.c">
+    <ClCompile Include="..\lib\lua\src\lapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lauxlib.c">
+    <ClCompile Include="..\lib\lua\src\lauxlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lbaselib.c">
+    <ClCompile Include="..\lib\lua\src\lbaselib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lcode.c">
+    <ClCompile Include="..\lib\lua\src\lcode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldblib.c">
+    <ClCompile Include="..\lib\lua\src\ldblib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldebug.c">
+    <ClCompile Include="..\lib\lua\src\ldebug.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldo.c">
+    <ClCompile Include="..\lib\lua\src\ldo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldump.c">
+    <ClCompile Include="..\lib\lua\src\ldump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lfunc.c">
+    <ClCompile Include="..\lib\lua\src\lfunc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lgc.c">
+    <ClCompile Include="..\lib\lua\src\lgc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\linit.c">
+    <ClCompile Include="..\lib\lua\src\linit.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\liolib.c">
+    <ClCompile Include="..\lib\lua\src\liolib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\llex.c">
+    <ClCompile Include="..\lib\lua\src\llex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lmathlib.c">
+    <ClCompile Include="..\lib\lua\src\lmathlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lmem.c">
+    <ClCompile Include="..\lib\lua\src\lmem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\loadlib.c">
+    <ClCompile Include="..\lib\lua\src\loadlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lobject.c">
+    <ClCompile Include="..\lib\lua\src\lobject.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lopcodes.c">
+    <ClCompile Include="..\lib\lua\src\lopcodes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\loslib.c">
+    <ClCompile Include="..\lib\lua\src\loslib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lparser.c">
+    <ClCompile Include="..\lib\lua\src\lparser.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstate.c">
+    <ClCompile Include="..\lib\lua\src\lstate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstring.c">
+    <ClCompile Include="..\lib\lua\src\lstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstrlib.c">
+    <ClCompile Include="..\lib\lua\src\lstrlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltable.c">
+    <ClCompile Include="..\lib\lua\src\ltable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltablib.c">
+    <ClCompile Include="..\lib\lua\src\ltablib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltm.c">
+    <ClCompile Include="..\lib\lua\src\ltm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lua.c">
+    <ClCompile Include="..\lib\lua\src\lua.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\luac.c">
+    <ClCompile Include="..\lib\lua\src\luac.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lundump.c">
+    <ClCompile Include="..\lib\lua\src\lundump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lvm.c">
+    <ClCompile Include="..\lib\lua\src\lvm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lzio.c">
+    <ClCompile Include="..\lib\lua\src\lzio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\print.c">
+    <ClCompile Include="..\lib\lua\src\print.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lua-5.1.4\src\lapi.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lauxlib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lcode.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldebug.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldo.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lfunc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lgc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llex.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llimits.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lmem.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lobject.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lopcodes.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lparser.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstate.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstring.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltable.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lua.h" />
-    <ClInclude Include="..\lua-5.1.4\src\luaconf.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lualib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lundump.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lvm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lzio.h" />
+    <ClInclude Include="..\lib\lua\src\lapi.h" />
+    <ClInclude Include="..\lib\lua\src\lauxlib.h" />
+    <ClInclude Include="..\lib\lua\src\lcode.h" />
+    <ClInclude Include="..\lib\lua\src\ldebug.h" />
+    <ClInclude Include="..\lib\lua\src\ldo.h" />
+    <ClInclude Include="..\lib\lua\src\lfunc.h" />
+    <ClInclude Include="..\lib\lua\src\lgc.h" />
+    <ClInclude Include="..\lib\lua\src\llex.h" />
+    <ClInclude Include="..\lib\lua\src\llimits.h" />
+    <ClInclude Include="..\lib\lua\src\lmem.h" />
+    <ClInclude Include="..\lib\lua\src\lobject.h" />
+    <ClInclude Include="..\lib\lua\src\lopcodes.h" />
+    <ClInclude Include="..\lib\lua\src\lparser.h" />
+    <ClInclude Include="..\lib\lua\src\lstate.h" />
+    <ClInclude Include="..\lib\lua\src\lstring.h" />
+    <ClInclude Include="..\lib\lua\src\ltable.h" />
+    <ClInclude Include="..\lib\lua\src\ltm.h" />
+    <ClInclude Include="..\lib\lua\src\lua.h" />
+    <ClInclude Include="..\lib\lua\src\luaconf.h" />
+    <ClInclude Include="..\lib\lua\src\lualib.h" />
+    <ClInclude Include="..\lib\lua\src\lundump.h" />
+    <ClInclude Include="..\lib\lua\src\lvm.h" />
+    <ClInclude Include="..\lib\lua\src\lzio.h" />
   </ItemGroup>
 </Project>

VC2013/MCServer.ipgset

@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PerformanceGuideStateManager xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.intel.com">
-  <Checkpoints xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
-  <CompletionStatusMap xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>PerformanceGuide</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>Introduction</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>true</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GettingStarted</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>true</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceBaseline</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>true</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfBaseline</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ProfileApp</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ReviewHotspots</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UseIntelCompiler</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>SelectFilesForIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>DetermineIntelCompilerOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithNewOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressNewOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UseGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ReviewGAPAdvice</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UsePGO</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressPGO</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ContinueOptimizations</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ParallelAmplifier</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ParallelAdvisor</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>Summary</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-  </CompletionStatusMap>
-  <GapAdvices xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide" />
-  <GapAnalysisHasBeenRun>false</GapAnalysisHasBeenRun>
-  <Hotspots />
-  <IppMatches />
-  <IppSearchHasBeenRun>false</IppSearchHasBeenRun>
-  <OptionSelectorDialogState xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide" />
-  <OptionSelectorHasBeenRun>false</OptionSelectorHasBeenRun>
-  <SearchIppDialogState>
-    <Domains>
-      <IppDomainViewModel>
-        <DomainName>Image Color Conversion</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Symmetric Cryptography</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>One-Way Hash Primitives</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Public Key Cryptography</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Image Geometry Transforms</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Image Compression</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Video Coding</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Computer Vision</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Data Integrity</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Digital Signal Processing</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Speech And Telephony Encode/Decode</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Data Compression</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Audio Coding</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-    </Domains>
-    <SearchInComments>true</SearchInComments>
-  </SearchIppDialogState>
-  <UIState>0</UIState>
-  <WorkflowSettings xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide">
-    <d2p1:CopyFromConfigurationName></d2p1:CopyFromConfigurationName>
-    <d2p1:CreateNewConfiguration>true</d2p1:CreateNewConfiguration>
-    <d2p1:NewConfigurationName></d2p1:NewConfigurationName>
-    <d2p1:UseDebugSettingsToRun>true</d2p1:UseDebugSettingsToRun>
-  </WorkflowSettings>
-</PerformanceGuideStateManager>

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

VC2013/ToLua.vcxproj

@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -111,7 +111,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -123,7 +123,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -134,15 +134,15 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tolua++-1.0.93\src\bin\tolua.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_event.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_is.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_map.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_push.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_to.c" />
+    <ClCompile Include="..\lib\tolua++\src\bin\tolua.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_event.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_is.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_map.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_push.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_to.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tolua++-1.0.93\src\lib\tolua_event.h" />
+    <ClInclude Include="..\lib\tolua++\src\lib\tolua_event.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/ToLua.vcxproj.filters

@@ -7,27 +7,27 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\tolua++-1.0.93\src\bin\tolua.c">
+    <ClCompile Include="..\lib\tolua++\src\bin\tolua.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_event.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_event.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_is.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_is.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_map.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_push.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_push.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_to.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_to.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tolua++-1.0.93\src\lib\tolua_event.h">
+    <ClInclude Include="..\lib\tolua++\src\lib\tolua_event.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>

VC2013/expat.vcxproj

@@ -73,26 +73,26 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\expat\ascii.h" />
-    <ClInclude Include="..\expat\asciitab.h" />
-    <ClInclude Include="..\expat\expat.h" />
-    <ClInclude Include="..\expat\expat_external.h" />
-    <ClInclude Include="..\expat\iasciitab.h" />
-    <ClInclude Include="..\expat\internal.h" />
-    <ClInclude Include="..\expat\latin1tab.h" />
-    <ClInclude Include="..\expat\nametab.h" />
-    <ClInclude Include="..\expat\utf8tab.h" />
-    <ClInclude Include="..\expat\winconfig.h" />
-    <ClInclude Include="..\expat\xmlrole.h" />
-    <ClInclude Include="..\expat\xmltok.h" />
-    <ClInclude Include="..\expat\xmltok_impl.h" />
+    <ClInclude Include="..\lib\expat\ascii.h" />
+    <ClInclude Include="..\lib\expat\asciitab.h" />
+    <ClInclude Include="..\lib\expat\expat.h" />
+    <ClInclude Include="..\lib\expat\expat_external.h" />
+    <ClInclude Include="..\lib\expat\iasciitab.h" />
+    <ClInclude Include="..\lib\expat\internal.h" />
+    <ClInclude Include="..\lib\expat\latin1tab.h" />
+    <ClInclude Include="..\lib\expat\nametab.h" />
+    <ClInclude Include="..\lib\expat\utf8tab.h" />
+    <ClInclude Include="..\lib\expat\winconfig.h" />
+    <ClInclude Include="..\lib\expat\xmlrole.h" />
+    <ClInclude Include="..\lib\expat\xmltok.h" />
+    <ClInclude Include="..\lib\expat\xmltok_impl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\expat\xmlparse.c" />
-    <ClCompile Include="..\expat\xmlrole.c" />
-    <ClCompile Include="..\expat\xmltok.c" />
-    <ClCompile Include="..\expat\xmltok_impl.c" />
-    <ClCompile Include="..\expat\xmltok_ns.c" />
+    <ClCompile Include="..\lib\expat\xmlparse.c" />
+    <ClCompile Include="..\lib\expat\xmlrole.c" />
+    <ClCompile Include="..\lib\expat\xmltok.c" />
+    <ClCompile Include="..\lib\expat\xmltok_impl.c" />
+    <ClCompile Include="..\lib\expat\xmltok_ns.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/expat.vcxproj.filters

@@ -7,60 +7,60 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\expat\ascii.h">
+    <ClInclude Include="..\lib\expat\ascii.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\asciitab.h">
+    <ClInclude Include="..\lib\expat\asciitab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\expat.h">
+    <ClInclude Include="..\lib\expat\expat.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\expat_external.h">
+    <ClInclude Include="..\lib\expat\expat_external.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\iasciitab.h">
+    <ClInclude Include="..\lib\expat\iasciitab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\internal.h">
+    <ClInclude Include="..\lib\expat\internal.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\latin1tab.h">
+    <ClInclude Include="..\lib\expat\latin1tab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\nametab.h">
+    <ClInclude Include="..\lib\expat\nametab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\utf8tab.h">
+    <ClInclude Include="..\lib\expat\utf8tab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\winconfig.h">
+    <ClInclude Include="..\lib\expat\winconfig.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmlrole.h">
+    <ClInclude Include="..\lib\expat\xmlrole.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmltok.h">
+    <ClInclude Include="..\lib\expat\xmltok.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmltok_impl.h">
+    <ClInclude Include="..\lib\expat\xmltok_impl.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\expat\xmlparse.c">
+    <ClCompile Include="..\lib\expat\xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmlrole.c">
+    <ClCompile Include="..\lib\expat\xmlrole.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok.c">
+    <ClCompile Include="..\lib\expat\xmltok.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok_impl.c">
+    <ClCompile Include="..\lib\expat\xmltok_impl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok_ns.c">
+    <ClCompile Include="..\lib\expat\xmltok_ns.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

VC2013/zlib.vcxproj

@@ -134,34 +134,34 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\zlib-1.2.7\adler32.c" />
-    <ClCompile Include="..\zlib-1.2.7\compress.c" />
-    <ClCompile Include="..\zlib-1.2.7\crc32.c" />
-    <ClCompile Include="..\zlib-1.2.7\deflate.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzclose.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzlib.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzread.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzwrite.c" />
-    <ClCompile Include="..\zlib-1.2.7\infback.c" />
-    <ClCompile Include="..\zlib-1.2.7\inffast.c" />
-    <ClCompile Include="..\zlib-1.2.7\inflate.c" />
-    <ClCompile Include="..\zlib-1.2.7\inftrees.c" />
-    <ClCompile Include="..\zlib-1.2.7\trees.c" />
-    <ClCompile Include="..\zlib-1.2.7\uncompr.c" />
-    <ClCompile Include="..\zlib-1.2.7\zutil.c" />
+    <ClCompile Include="..\lib\zlib\adler32.c" />
+    <ClCompile Include="..\lib\zlib\compress.c" />
+    <ClCompile Include="..\lib\zlib\crc32.c" />
+    <ClCompile Include="..\lib\zlib\deflate.c" />
+    <ClCompile Include="..\lib\zlib\gzclose.c" />
+    <ClCompile Include="..\lib\zlib\gzlib.c" />
+    <ClCompile Include="..\lib\zlib\gzread.c" />
+    <ClCompile Include="..\lib\zlib\gzwrite.c" />
+    <ClCompile Include="..\lib\zlib\infback.c" />
+    <ClCompile Include="..\lib\zlib\inffast.c" />
+    <ClCompile Include="..\lib\zlib\inflate.c" />
+    <ClCompile Include="..\lib\zlib\inftrees.c" />
+    <ClCompile Include="..\lib\zlib\trees.c" />
+    <ClCompile Include="..\lib\zlib\uncompr.c" />
+    <ClCompile Include="..\lib\zlib\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\zlib-1.2.7\crc32.h" />
-    <ClInclude Include="..\zlib-1.2.7\deflate.h" />
-    <ClInclude Include="..\zlib-1.2.7\gzguts.h" />
-    <ClInclude Include="..\zlib-1.2.7\inffast.h" />
-    <ClInclude Include="..\zlib-1.2.7\inffixed.h" />
-    <ClInclude Include="..\zlib-1.2.7\inflate.h" />
-    <ClInclude Include="..\zlib-1.2.7\inftrees.h" />
-    <ClInclude Include="..\zlib-1.2.7\trees.h" />
-    <ClInclude Include="..\zlib-1.2.7\zconf.h" />
-    <ClInclude Include="..\zlib-1.2.7\zlib.h" />
-    <ClInclude Include="..\zlib-1.2.7\zutil.h" />
+    <ClInclude Include="..\lib\zlib\crc32.h" />
+    <ClInclude Include="..\lib\zlib\deflate.h" />
+    <ClInclude Include="..\lib\zlib\gzguts.h" />
+    <ClInclude Include="..\lib\zlib\inffast.h" />
+    <ClInclude Include="..\lib\zlib\inffixed.h" />
+    <ClInclude Include="..\lib\zlib\inflate.h" />
+    <ClInclude Include="..\lib\zlib\inftrees.h" />
+    <ClInclude Include="..\lib\zlib\trees.h" />
+    <ClInclude Include="..\lib\zlib\zconf.h" />
+    <ClInclude Include="..\lib\zlib\zlib.h" />
+    <ClInclude Include="..\lib\zlib\zutil.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VC2013/zlib.vcxproj.filters

@@ -7,84 +7,84 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\zlib-1.2.7\adler32.c">
+    <ClCompile Include="..\lib\zlib\adler32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\compress.c">
+    <ClCompile Include="..\lib\zlib\compress.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\crc32.c">
+    <ClCompile Include="..\lib\zlib\crc32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\deflate.c">
+    <ClCompile Include="..\lib\zlib\deflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzclose.c">
+    <ClCompile Include="..\lib\zlib\gzclose.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzlib.c">
+    <ClCompile Include="..\lib\zlib\gzlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzread.c">
+    <ClCompile Include="..\lib\zlib\gzread.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzwrite.c">
+    <ClCompile Include="..\lib\zlib\gzwrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\infback.c">
+    <ClCompile Include="..\lib\zlib\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inffast.c">
+    <ClCompile Include="..\lib\zlib\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inflate.c">
+    <ClCompile Include="..\lib\zlib\inflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inftrees.c">
+    <ClCompile Include="..\lib\zlib\inftrees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\trees.c">
+    <ClCompile Include="..\lib\zlib\trees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\uncompr.c">
+    <ClCompile Include="..\lib\zlib\uncompr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\zutil.c">
+    <ClCompile Include="..\lib\zlib\zutil.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\zlib-1.2.7\crc32.h">
+    <ClInclude Include="..\lib\zlib\crc32.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\deflate.h">
+    <ClInclude Include="..\lib\zlib\deflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\gzguts.h">
+    <ClInclude Include="..\lib\zlib\gzguts.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inffast.h">
+    <ClInclude Include="..\lib\zlib\inffast.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inffixed.h">
+    <ClInclude Include="..\lib\zlib\inffixed.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inflate.h">
+    <ClInclude Include="..\lib\zlib\inflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inftrees.h">
+    <ClInclude Include="..\lib\zlib\inftrees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\trees.h">
+    <ClInclude Include="..\lib\zlib\trees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zconf.h">
+    <ClInclude Include="..\lib\zlib\zconf.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zlib.h">
+    <ClInclude Include="..\lib\zlib\zlib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zutil.h">
+    <ClInclude Include="..\lib\zlib\zutil.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>