Added linux libs

eXo-OpenSource · Jul 27, 2019 · fdb743f · fdb743f
1 parent 280cc23
commit fdb743f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/module/RedisClient.cpp b/module/RedisClient.cpp
@@ -3,7 +3,7 @@
 
 redis_client::redis_client()
 {
-	_client = new cpp_redis::client();
+	_client     = new cpp_redis::client();
 	_subscriber = new cpp_redis::subscriber();
 
 	g_Module->AddRedisClient(this);

diff --git a/module/lib/cpp_redis.a b/module/lib/cpp_redis.a
diff --git a/module/lib/tacopie.a b/module/lib/tacopie.a
diff --git a/module/premake5.lua b/module/premake5.lua
@@ -35,6 +35,8 @@ project "module"
 		debugcommand "../mta-server/MTA Server64.exe"
 
 	filter "system:linux"
+		links { "tacopie.a" }
+		links { "cpp_redis.a" }
 
 	filter "system:not linux"
 		excludes { "luaimports/luaimports.linux.h", "luaimports/luaimports.linux.cpp" }
diff --git a/test/Main.cpp b/test/Main.cpp
@@ -4,15 +4,18 @@
 int main(int argc, char* argv[])
 {
 	try {
-		const auto w_version_requested = MAKEWORD(2, 2);
-		WSADATA wsa_data;
-		const auto err = WSAStartup(w_version_requested, &wsa_data);
-		if (err != 0) {
-	        /* Tell the user that we could not find a usable */
-	        /* Winsock DLL.                                  */
-	        printf("WSAStartup failed with error: %d\n", err);
-	        return 1;
-		}
+
+#ifdef WINDOWS
+			const auto w_version_requested = MAKEWORD(2, 2);
+			WSADATA wsa_data;
+			const auto err = WSAStartup(w_version_requested, &wsa_data);
+			if (err != 0) {
+		        /* Tell the user that we could not find a usable */
+		        /* Winsock DLL.                                  */
+		        printf("WSAStartup failed with error: %d\n", err);
+		        return 1;
+			}
+#endif
 
 		cpp_redis::client client;
 		client.connect();

diff --git a/test/lib/cpp_redis.a b/test/lib/cpp_redis.a
diff --git a/test/lib/tacopie.a b/test/lib/tacopie.a
diff --git a/test/premake5.lua b/test/premake5.lua
@@ -27,3 +27,5 @@ project "test"
 		links { "cpp_redis_64.lib" }
 
 	filter "system:linux"
+		links { "tacopie.a" }
+		links { "cpp_redis.a" }