From 8285a11a26d78784f26b76e6bcdfa479f6c1a345 Mon Sep 17 00:00:00 2001 From: faketruth Date: Tue, 8 Nov 2011 01:25:01 +0000 Subject: It's a Squirrel!! In SquirrelBindings.h use #define USE_SQUIRREL 1 to enable squirrel git-svn-id: http://mc-server.googlecode.com/svn/trunk@76 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- VC2010/JsonCpp.vcxproj | 1 + VC2010/MCServer.sln | 17 +++++++---------- VC2010/MCServer.vcxproj | 14 +++++++------- VC2010/MCServer.vcxproj.filters | 10 ++++++++++ VC2010/WebServer.vcxproj | 1 + VC2010/ZLib.vcxproj | 3 +-- VC2010/lua-5.1.4.vcxproj | 3 ++- VC2010/tolua++-1.0.93.vcxproj | 1 + 8 files changed, 30 insertions(+), 20 deletions(-) (limited to 'VC2010') 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 @@ true ..\jsoncpp-src-0.5.0\include;%(AdditionalIncludeDirectories) MultiThreaded + Speed true 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 @@ /ZI /D_DEBUG %(AdditionalOptions) Disabled - ..\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) + ..\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) WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) false Sync @@ -94,7 +94,7 @@ /IGNORE:4078 %(AdditionalOptions) - winmm.lib;ws2_32.lib;Psapi.lib;ZLib.lib;tolua++-1.0.93.lib;lua-5.1.4.lib;WebServer.lib;JsonCpp.lib;%(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) ../$(ProjectName)_debug.exe VLD;./Debug/;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) @@ -145,10 +145,7 @@ Default true Speed - false - ..\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) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - Sync + ..\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) Default MultiThreaded false @@ -161,10 +158,11 @@ Level4 + true /IGNORE:4078 %(AdditionalOptions) - 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) + 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) ../$(ProjectName).exe ./Release/;%(AdditionalLibraryDirectories) LIBCMT;%(IgnoreSpecificDefaultLibraries) @@ -350,6 +348,7 @@ + @@ -498,6 +497,7 @@ + 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 @@ {b0401fd9-4021-4ab7-bf61-c8de112b4196} + + {a71ee043-df55-4d42-a9aa-1643b40e1c22} + {0a6d025d-4fb8-4557-a348-004b819ea477} @@ -781,6 +784,10 @@ cLavaSimulator + + LuaBindings\SquirrelBindings + + Packets\cPacket_Explosion @@ -1212,6 +1219,9 @@ cLavaSimulator + + LuaBindings\SquirrelBindings + Packets\cPacket_Explosion 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 @@ true true MultiThreaded + Speed true 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 @@ EnableFastChecks MultiThreadedDebugDLL Level3 - EditAndContinue @@ -94,7 +93,7 @@ MultiThreaded true Level3 - ProgramDatabase + Speed true 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 @@ Disabled true EnableFastChecks - MultiThreadedDebug Level3 EditAndContinue + MultiThreadedDebugDLL @@ -95,6 +95,7 @@ true Level3 ProgramDatabase + Speed true 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 @@ true Level3 ProgramDatabase + Speed true -- cgit v1.2.3