8 files changed, 30 insertions, 20 deletions

diff --git a/VC2010/JsonCpp.vcxproj b/VC2010/JsonCpp.vcxproj
index 1596ff6c1..7e92d3e51 100644
--- a/VC2010/JsonCpp.vcxproj
+++ b/VC2010/JsonCpp.vcxproj
@@ -55,6 +55,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <AdditionalIncludeDirectories>..\jsoncpp-src-0.5.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/VC2010/MCServer.sln b/VC2010/MCServer.sln
index 5ac930e28..79a5670f1 100644
--- a/VC2010/MCServer.sln
+++ b/VC2010/MCServer.sln
@@ -17,10 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebServer", "WebServer.vcxp
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonCpp", "JsonCpp.vcxproj", "{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Converter", "Converter.vcxproj", "{9AB1FB82-2148-40E4-919F-3B184B4593C8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{F6F43A78-816D-4C37-A07B-68BED529273A} = {F6F43A78-816D-4C37-A07B-68BED529273A}

-	EndProjectSection

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squirrel_3_0_1_stable", "squirrel_3_0_1_stable.vcxproj", "{4571CE2D-9E18-452F-90D6-94AE8E2406F4}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -76,12 +73,12 @@ Global
 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|Win32.ActiveCfg = Release|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|Win32.Build.0 = Release|Win32

 		{ADBF25B9-7192-4E54-B35E-8EC47CA5EF86}.Release|x64.ActiveCfg = Release|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Debug|Win32.Build.0 = Debug|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Debug|x64.ActiveCfg = Debug|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Release|Win32.ActiveCfg = Release|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Release|Win32.Build.0 = Release|Win32

-		{9AB1FB82-2148-40E4-919F-3B184B4593C8}.Release|x64.ActiveCfg = Release|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|Win32.Build.0 = Debug|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Debug|x64.ActiveCfg = Debug|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Release|Win32.ActiveCfg = Release|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Release|Win32.Build.0 = Release|Win32

+		{4571CE2D-9E18-452F-90D6-94AE8E2406F4}.Release|x64.ActiveCfg = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index c761becb2..500c235e2 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -78,7 +78,7 @@
     <ClCompile>

       <AdditionalOptions>/ZI /D_DEBUG %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <ExceptionHandling>Sync</ExceptionHandling>

@@ -94,7 +94,7 @@
     </ClCompile>

     <Link>

       <AdditionalOptions>/IGNORE:4078 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;ZLib.lib;tolua++-1.0.93.lib;lua-5.1.4.lib;WebServer.lib;JsonCpp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;ZLib.lib;tolua++-1.0.93.lib;lua-5.1.4.lib;WebServer.lib;JsonCpp.lib;squirrel_3_0_1_stable.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>../$(ProjectName)_debug.exe</OutputFile>

       <AdditionalLibraryDirectories>VLD;./Debug/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

@@ -145,10 +145,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

-      <WholeProgramOptimization>false</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <ExceptionHandling>Sync</ExceptionHandling>

+      <AdditionalIncludeDirectories>..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.5;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <BasicRuntimeChecks>Default</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -161,10 +158,11 @@
       <WarningLevel>Level4</WarningLevel>

       <DebugInformationFormat>

       </DebugInformationFormat>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <Link>

       <AdditionalOptions>/IGNORE:4078 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;ZLib.lib;tolua++-1.0.93.lib;lua-5.1.4.lib;WebServer.lib;JsonCpp.lib;libCMT.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;ws2_32.lib;Psapi.lib;ZLib.lib;tolua++-1.0.93.lib;lua-5.1.4.lib;WebServer.lib;JsonCpp.lib;squirrel_3_0_1_stable.lib;LIBCMT.LIB;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>../$(ProjectName).exe</OutputFile>

       <AdditionalLibraryDirectories>./Release/;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

@@ -350,6 +348,7 @@
     <ClCompile Include="..\source\packets\cPacket_WindowClick.cpp" />

     <ClCompile Include="..\source\packets\cPacket_WindowClose.cpp" />

     <ClCompile Include="..\source\packets\cPacket_WindowOpen.cpp" />

+    <ClCompile Include="..\source\SquirrelBindings.cpp" />

     <ClCompile Include="..\source\Vector3d.cpp" />

     <ClCompile Include="..\source\Vector3f.cpp" />

     <ClCompile Include="..\source\Vector3i.cpp" />

@@ -498,6 +497,7 @@
     <ClInclude Include="..\source\packets\cPacket_WindowClick.h" />

     <ClInclude Include="..\source\packets\cPacket_WindowClose.h" />

     <ClInclude Include="..\source\packets\cPacket_WindowOpen.h" />

+    <ClInclude Include="..\source\SquirrelBindings.h" />

     <ClInclude Include="..\source\Vector3d.h" />

     <ClInclude Include="..\source\Vector3f.h" />

     <ClInclude Include="..\source\Vector3i.h" />

diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 7bdb69d87..77ed3cf2b 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -385,6 +385,9 @@
     <Filter Include="cLavaSimulator">

       <UniqueIdentifier>{b0401fd9-4021-4ab7-bf61-c8de112b4196}</UniqueIdentifier>

     </Filter>

+    <Filter Include="LuaBindings\SquirrelBindings">

+      <UniqueIdentifier>{a71ee043-df55-4d42-a9aa-1643b40e1c22}</UniqueIdentifier>

+    </Filter>

     <Filter Include="Packets\cPacket_Explosion">

       <UniqueIdentifier>{0a6d025d-4fb8-4557-a348-004b819ea477}</UniqueIdentifier>

     </Filter>

@@ -781,6 +784,10 @@
     <ClCompile Include="..\source\cLavaSimulator.cpp">

       <Filter>cLavaSimulator</Filter>

     </ClCompile>

+    <ClCompile Include="..\source\SquirrelBindings.cpp">

+      <Filter>LuaBindings\SquirrelBindings</Filter>

+    </ClCompile>

+  </ItemGroup>

     <ClCompile Include="..\source\packets\cPacket_Explosion.cpp">

       <Filter>Packets\cPacket_Explosion</Filter>

     </ClCompile>

@@ -1212,6 +1219,9 @@
     <ClInclude Include="..\source\cLavaSimulator.h">

       <Filter>cLavaSimulator</Filter>

     </ClInclude>

+    <ClInclude Include="..\source\SquirrelBindings.h">

+      <Filter>LuaBindings\SquirrelBindings</Filter>

+    </ClInclude>

     <ClInclude Include="..\source\packets\cPacket_Explosion.h">

       <Filter>Packets\cPacket_Explosion</Filter>

     </ClInclude>

diff --git a/VC2010/WebServer.vcxproj b/VC2010/WebServer.vcxproj
index c19fafad6..934c3803d 100644
--- a/VC2010/WebServer.vcxproj
+++ b/VC2010/WebServer.vcxproj
@@ -98,6 +98,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/VC2010/ZLib.vcxproj b/VC2010/ZLib.vcxproj
index 6b8a56cb1..fcc0538e1 100644
--- a/VC2010/ZLib.vcxproj
+++ b/VC2010/ZLib.vcxproj
@@ -71,7 +71,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Lib />

   </ItemDefinitionGroup>

@@ -94,7 +93,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

     </ClCompile>

     <Lib>

       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>

diff --git a/VC2010/lua-5.1.4.vcxproj b/VC2010/lua-5.1.4.vcxproj
index 2cf480b02..503345c0e 100644
--- a/VC2010/lua-5.1.4.vcxproj
+++ b/VC2010/lua-5.1.4.vcxproj
@@ -69,9 +69,9 @@
       <Optimization>Disabled</Optimization>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

     </ClCompile>

     <Lib />

   </ItemDefinitionGroup>

@@ -95,6 +95,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

     </ClCompile>

     <Lib>

       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>

diff --git a/VC2010/tolua++-1.0.93.vcxproj b/VC2010/tolua++-1.0.93.vcxproj
index 02d38f145..9fbec5d5d 100644
--- a/VC2010/tolua++-1.0.93.vcxproj
+++ b/VC2010/tolua++-1.0.93.vcxproj
@@ -98,6 +98,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

     </ClCompile>

     <Lib>

       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>