From 083228a10dffcaa77b1d0035c29013c6802befd4 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Sun, 8 Jul 2012 21:01:08 +0000 Subject: Squirrel Plugins I worked a little bit on the squirrel Bindings They work now on linux and windows :) (OSX is untested, but should work also) but they are very limited at the moment. (Only made OnChat working) I also fixed some small bugs. git-svn-id: http://mc-server.googlecode.com/svn/trunk@648 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- VC2010/MCServer.vcxproj | 20 +++++--- VC2010/MCServer.vcxproj.filters | 71 ++++++++++++++++++---------- VC2010/squirrel_3_0_1_stable.vcxproj | 22 --------- VC2010/squirrel_3_0_1_stable.vcxproj.filters | 69 --------------------------- 4 files changed, 61 insertions(+), 121 deletions(-) (limited to 'VC2010') diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj index 324c499f4..a75974183 100644 --- a/VC2010/MCServer.vcxproj +++ b/VC2010/MCServer.vcxproj @@ -99,7 +99,7 @@ /ZI /D_DEBUG %(AdditionalOptions) Disabled - ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories) + ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;..\squirrel_3_0_1_stable\sqrat;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true Sync @@ -130,7 +130,7 @@ Disabled - ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories) + ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;..\squirrel_3_0_1_stable\sqrat;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true Sync @@ -228,7 +228,7 @@ Default true Speed - ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;%(AdditionalIncludeDirectories) + ..\tolua++-1.0.93\include;..\lua-5.1.4\src;..\zlib-1.2.7;..\mysql-connector\include;..\source\;..\pdcurs34\;..\jsoncpp-src-0.5.0\include;..\squirrel_3_0_1_stable\include;..\squirrel_3_0_1_stable;..\squirrel_3_0_1_stable\sqrat;%(AdditionalIncludeDirectories) Default MultiThreaded false @@ -306,6 +306,7 @@ + @@ -356,6 +357,7 @@ + @@ -472,7 +474,8 @@ - + + true NotUsing @@ -495,6 +498,7 @@ + @@ -522,6 +526,7 @@ + @@ -660,7 +665,10 @@ - + + + + @@ -706,4 +714,4 @@ - + \ No newline at end of file diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters index 0a3e16992..1793d9b49 100644 --- a/VC2010/MCServer.vcxproj.filters +++ b/VC2010/MCServer.vcxproj.filters @@ -427,12 +427,15 @@ {4b3b7b43-8e8b-4823-b112-2259fdfff7d3} - - {833e49bd-848d-42de-ac60-6cd7656474e3} - {038cf4bd-108e-44e2-bdcb-9d48fb26676e} + + {43f91962-ebda-4195-aadc-921eca3c8356} + + + {833e49bd-848d-42de-ac60-6cd7656474e3} + @@ -799,9 +802,6 @@ Simulator\cSimulator\cFluidSimulator\cLavaSimulator - - LuaBindings\SquirrelBindings - Packets\cPacket_Explosion @@ -870,26 +870,26 @@ Packets - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating Storage @@ -904,6 +904,16 @@ Storage + + + LuaBindings\SquirrelBindings + + + cPlugin\cPlugin_Squirrel + + + LuaBindings\SquirrelBindings + @@ -1308,9 +1318,6 @@ Simulator\cSimulator\cFluidSimulator\cLavaSimulator - - LuaBindings\SquirrelBindings - Packets\cPacket_Explosion @@ -1380,25 +1387,25 @@ Packets - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating - Generating + HandyStuff\Generating Storage @@ -1414,6 +1421,22 @@ + + + LuaBindings\SquirrelBindings + + + cPlugin\cPlugin_Squirrel + + + LuaBindings\SquirrelBindings + + + LuaBindings\SquirrelBindings + + + LuaBindings\SquirrelBindings + @@ -1430,4 +1453,4 @@ - + \ No newline at end of file diff --git a/VC2010/squirrel_3_0_1_stable.vcxproj b/VC2010/squirrel_3_0_1_stable.vcxproj index 92b9cc05b..b8136ec94 100644 --- a/VC2010/squirrel_3_0_1_stable.vcxproj +++ b/VC2010/squirrel_3_0_1_stable.vcxproj @@ -72,13 +72,6 @@ - - - - - - - @@ -101,21 +94,6 @@ - - - - - - - - - - - - - - - diff --git a/VC2010/squirrel_3_0_1_stable.vcxproj.filters b/VC2010/squirrel_3_0_1_stable.vcxproj.filters index 760a87547..a3e7f9767 100644 --- a/VC2010/squirrel_3_0_1_stable.vcxproj.filters +++ b/VC2010/squirrel_3_0_1_stable.vcxproj.filters @@ -7,9 +7,6 @@ {819d39f8-4859-48ad-b096-04f8d6811524} - - {d9a1c0d8-bd70-4686-9a3d-c35c9d3365e3} - @@ -72,27 +69,6 @@ sqstdlib - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - @@ -149,50 +125,5 @@ sqstdlib - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - - - sqplus - \ No newline at end of file -- cgit v1.2.3