No need to static-link squirrel libs anymore

Thanks to SLC!

RCON/RCON.vcxproj

@@ -120,15 +120,15 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>squirrel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <CustomBuildStep>
       <Command>
       </Command>
     </CustomBuildStep>
     <PostBuildEvent>
-      <Command>rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll</Command>
+      <Command>move "$(SolutionDir)\$(Configuration)\RCONWin32.dll" "$(SolutionDir)\$(Configuration)\RCONx86.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -142,15 +142,16 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>squirrel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <CustomBuildStep>
       <Command>
       </Command>
     </CustomBuildStep>
     <PostBuildEvent>
-      <Command>rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -169,14 +170,14 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>squirrel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>
       </Command>
     </CustomBuildStep>
     <PostBuildEvent>
-      <Command>rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll</Command>
+      <Command>move "$(SolutionDir)\$(Configuration)\RCONWin32.dll" "$(SolutionDir)\$(Configuration)\RCONx86.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -195,27 +196,22 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>squirrel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>
       </Command>
     </CustomBuildStep>
     <PostBuildEvent>
-      <Command>rename "$(SolutionDir)\$(Configuration)\RCONWin32.dll" RCONx86.dll</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="inc\SQImports.h" />
     <ClInclude Include="inc\SQModule.h" />
     <ClInclude Include="src\Client.h" />
     <ClInclude Include="inc\sqconfig.h" />
-    <ClInclude Include="inc\sqstdaux.h" />
-    <ClInclude Include="inc\sqstdblob.h" />
-    <ClInclude Include="inc\sqstdio.h" />
-    <ClInclude Include="inc\sqstdmath.h" />
-    <ClInclude Include="inc\sqstdstring.h" />
-    <ClInclude Include="inc\sqstdsystem.h" />
     <ClInclude Include="inc\squirrel.h" />
     <ClInclude Include="inc\VCMP.h" />
     <ClInclude Include="src\events.h" />

RCON/RCON.vcxproj.filters

@@ -24,24 +24,6 @@
     <ClInclude Include="inc\sqconfig.h">
       <Filter>Header Files\Squirrel</Filter>
     </ClInclude>
-    <ClInclude Include="inc\sqstdaux.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
-    <ClInclude Include="inc\sqstdblob.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
-    <ClInclude Include="inc\sqstdio.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
-    <ClInclude Include="inc\sqstdmath.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
-    <ClInclude Include="inc\sqstdstring.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
-    <ClInclude Include="inc\sqstdsystem.h">
-      <Filter>Header Files\Squirrel</Filter>
-    </ClInclude>
     <ClInclude Include="inc\squirrel.h">
       <Filter>Header Files\Squirrel</Filter>
     </ClInclude>

RCON/makefile

@@ -1,42 +1,42 @@
 # I'm noob in writing makefiles, will improve this later on.
 
-debug32:
+release32:
 	mkdir -p ./obj/
 	mkdir -p ./bin/
-	mkdir -p ./bin/Debug/
-	g++ -m32 -pthread -std=c++11 -L./lib/ -c -g -fPIC -I./inc/ -I/usr/local/include -D_DEBUG ./src/*.cpp
+	mkdir -p ./bin/Release/
+	g++ -m32 -pthread -std=c++11 -c -fPIC -I./inc/ -I/usr/local/include ./src/*.cpp
 	mv *.o obj/
-	g++ -m32 -pthread -std=c++11 -L./lib/ -shared -o ./bin/Debug/RCON32.so ./obj/*.o -L/usr/local/lib ./lib/libsquirrel.a
+	g++ -m32 -pthread -std=c++11 -shared -o ./bin/Release/RCON32.so ./obj/*.o -L/usr/local/lib
 	@rm -Rf obj/*
 	@echo done.
 
-release32:
+release64:
 	mkdir -p ./obj/
 	mkdir -p ./bin/
 	mkdir -p ./bin/Release/
-	g++ -m32 -pthread -std=c++11 -L./lib/ -c -fPIC -I./inc/ -I/usr/local/include ./src/*.cpp
+	g++ -m64 -pthread -std=c++11 -c -fPIC -I./inc/ -I/usr/local/include ./src/*.cpp
 	mv *.o obj/
-	g++ -m32 -pthread -std=c++11 -L./lib/ -shared -o ./bin/Release/RCON32.so ./obj/*.o -L/usr/local/lib ./lib/libsquirrel.a
+	g++ -m64 -pthread -std=c++11 -shared -o ./bin/Release/RCON64.so ./obj/*.o -L/usr/local/lib
 	@rm -Rf obj/*
 	@echo done.
 
-debug64:
+debug32:
 	mkdir -p ./obj/
 	mkdir -p ./bin/
 	mkdir -p ./bin/Debug/
-	g++ -m64 -pthread -std=c++11 -L./lib/ -c -g -fPIC -I./inc/ -I/usr/local/include -D_DEBUG ./src/*.cpp
+	g++ -m32 -pthread -std=c++11 -c -g -fPIC -I./inc/ -I/usr/local/include -D_DEBUG ./src/*.cpp
 	mv *.o obj/
-	g++ -m64 -pthread -std=c++11 -L./lib/ -shared -o ./bin/Debug/RCON64.so ./obj/*.o -L/usr/local/lib ./lib/libsquirrel.a
+	g++ -m32 -pthread -std=c++11 -shared -o ./bin/Debug/RCON32.so ./obj/*.o -L/usr/local/lib
 	@rm -Rf obj/*
 	@echo done.
 
-release64:
+debug64:
 	mkdir -p ./obj/
 	mkdir -p ./bin/
-	mkdir -p ./bin/Release/
-	g++ -m64 -pthread -std=c++11 -L./lib/ -c -fPIC -I./inc/ -I/usr/local/include ./src/*.cpp
+	mkdir -p ./bin/Debug/
+	g++ -m64 -pthread -std=c++11 -c -g -fPIC -I./inc/ -I/usr/local/include -D_DEBUG ./src/*.cpp
 	mv *.o obj/
-	g++ -m64 -pthread -std=c++11 -L./lib/ -shared -o ./bin/Release/RCON64.so ./obj/*.o -L/usr/local/lib ./lib/libsquirrel.a
+	g++ -m64 -pthread -std=c++11 -shared -o ./bin/Debug/RCON64.so ./obj/*.o -L/usr/local/lib
 	@rm -Rf obj/*
 	@echo done.
 

RCON/src/SquirrelFunctions.cpp

@@ -32,27 +32,27 @@ namespace SquirrelFuncs
 		SQInteger clientid;
 		const SQChar* text;
 
-		sq_getinteger(v, 2, &clientid);
-		sq_getstring(v, 3, &text);
+		sqapi->getinteger(v, 2, &clientid);
+		sqapi->getstring(v, 3, &text);
 
 		Client* c = rcon->GetClient((int)clientid);
 		if (c == nullptr)
 		{
-			sq_pushbool(v, false);
+			sqapi->pushbool(v, false);
 			return 1;
 		}
-		sq_pushbool(v, c->Send(std::string((char*) text)));
+		sqapi->pushbool(v, c->Send(std::string((char*) text)));
 		return 1;
 	}
 
 	SQInteger RCON_Broadcast(HSQUIRRELVM v) // RCON_Broadcast(string text);
 	{
 		const SQChar* text;
 
-		sq_getstring(v, 2, &text);
+		sqapi->getstring(v, 2, &text);
 		SQInteger count = 0;
 		count = rcon->Broadcast(std::string((char*)text));
-		sq_pushinteger(v, count);
+		sqapi->pushinteger(v, count);
 		return 1;
 	}
 
@@ -68,27 +68,27 @@ namespace SquirrelFuncs
 				... // etc..
 			]
 		*/
-		sq_newarray(v, 0); // main array
+		sqapi->newarray(v, 0); // main array
 
 		for (Client* c : rcon->clients)
 		{
 			// client array
-			sq_newarray(v, 0); // client array
-			sq_pushstring(v, (const SQChar*)ipaddr(c).c_str(), -1); // ip
-			sq_arrayappend(v, -2);
-			sq_pushbool(v, (SQBool)c->isIdentified); // identified
-			sq_arrayappend(v, -2); // append to client array
-			sq_arrayappend(v, -2); // append client array to main array
+			sqapi->newarray(v, 0); // client array
+			sqapi->pushstring(v, (const SQChar*)ipaddr(c).c_str(), -1); // ip
+			sqapi->arrayappend(v, -2);
+			sqapi->pushbool(v, (SQBool)c->isIdentified); // identified
+			sqapi->arrayappend(v, -2); // append to client array
+			sqapi->arrayappend(v, -2); // append client array to main array
 		}
 		return 1;
 	}
 }
 
 void register_global_func(HSQUIRRELVM vm, const char *name, SQFUNCTION function)
 {
-	sq_pushroottable(vm);
-	sq_pushstring(vm, (const SQChar*)name, -1);
-	sq_newclosure(vm, function, 0);
-	sq_createslot(vm, -3);
-	sq_pop(vm, 1);
+	sqapi->pushroottable(vm);
+	sqapi->pushstring(vm, (const SQChar*)name, -1);
+	sqapi->newclosure(vm, function, 0);
+	sqapi->newslot(vm, -3, SQFalse);
+	sqapi->pop(vm, 1);
 }