GameNetworkingSockets: use openssl backend on windows (#1354)

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

packages/g/gamenetworkingsockets/port/xmake.lua

@@ -3,44 +3,35 @@ set_languages("gnu11")
 
 add_rules("mode.debug", "mode.release")
 
-add_requires("protobuf-cpp")
-if is_plat("windows") then
-    add_requires("libsodium")
-else
-    add_requires("openssl")
-end
+add_requires("protobuf-cpp", "openssl")
 
 target("gns") -- we need limit path length
     set_kind("$(kind)")
 
     add_vectorexts("sse2")
-    add_packages("protobuf-cpp")
+    add_packages("protobuf-cpp", "openssl")
     set_basename("gamenetworkingsockets")
 
     if is_plat("windows") then
-        add_packages("libsodium")
         add_syslinks("ws2_32")
-        add_defines("WIN32", "_WINDOWS", "STEAMNETWORKINGSOCKETS_CRYPTO_LIBSODIUM", "STEAMNETWORKINGSOCKETS_CRYPTO_25519_LIBSODIUM")
-        add_files(  "src/common/crypto_libsodium.cpp",
-                    "src/common/crypto_25519_libsodium.cpp")
+        add_defines("WIN32", "_WINDOWS")
     else
-        add_packages("openssl")
         add_syslinks("pthread")
-        add_defines("STEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL", "STEAMNETWORKINGSOCKETS_CRYPTO_VALVEOPENSSL", "OPENSSL_HAS_25519_RAW")
         add_defines("POSIX", "LINUX", "GNUC", "GNU_COMPILER")
-        add_files(  "src/common/crypto_openssl.cpp",
-                    "src/common/crypto_25519_openssl.cpp",
-                    "src/common/opensslwrapper.cpp")
     end
 
     if is_kind("shared") then
         add_defines("STEAMNETWORKINGSOCKETS_FOREXPORT")
     else
-        add_defines("STEAMNETWORKINGSOCKETS_STATIC_LINK")
+        add_defines("STEAMNETWORKINGSOCKETS_STATIC_LINK", "OPENSSL_USE_STATIC_LIBS")
     end
 
-    add_defines("VALVE_CRYPTO_ENABLE_25519",
+    add_defines("STEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL", 
+                "STEAMNETWORKINGSOCKETS_CRYPTO_VALVEOPENSSL", 
+                "OPENSSL_HAS_25519_RAW",
+                "VALVE_CRYPTO_ENABLE_25519",
                 "GOOGLE_PROTOBUF_NO_RTTI",
+                "VALVE_CRYPTO_25519_OPENSSL",
                 "CRYPTO_DISABLE_ENCRYPT_WITH_PASSWORD",
                 "ENABLE_OPENSSLCONNECTION")
 
@@ -57,6 +48,11 @@ target("gns") -- we need limit path length
     add_headerfiles("include/(steam/*.h)")
     add_headerfiles("include/(minbase/*.h)")
     add_headerfiles("src/public/(*/*.h)")
+    
+        -- OpenSSL specific files
+    add_files(  "src/common/crypto_openssl.cpp",
+                "src/common/crypto_25519_openssl.cpp",
+                "src/common/opensslwrapper.cpp")
 
     add_files(  "src/common/steamnetworkingsockets_messages_certs.proto",
                 "src/common/steamnetworkingsockets_messages.proto",

packages/g/gamenetworkingsockets/xmake.lua

@@ -7,6 +7,7 @@ package("gamenetworkingsockets")
     set_urls("https://github.com/ValveSoftware/GameNetworkingSockets/archive/$(version).tar.gz",
              "https://github.com/ValveSoftware/GameNetworkingSockets.git")
 
+    add_versions("v1.4.1", "1cfb2bf79c51a08ae4e8b7ff5e9c1266b43cfff6f53ecd3e7bc5e3fcb2a22503")
     add_versions("v1.4.0", "eca3b5684dbf81a3a6173741a38aa20d2d0a4d95be05cf88c70e0e50062c407b")
     add_versions("v1.3.0", "f473789ae8a8415dd1f5473793775e68a919d27eba18b9ba7d0a14f254afddf9")
     add_versions("v1.2.0", "768a7cec2491e34c824204c4858351af2866618ceb13a024336dc1df8076bef3")
@@ -22,11 +23,7 @@ package("gamenetworkingsockets")
     on_load("windows", "linux", function(package)
         if not package:config("shared") then
             package:add("defines", "STEAMNETWORKINGSOCKETS_STATIC_LINK")
-            if is_plat("windows") then
-                package:add("deps", "libsodium", "protobuf-cpp")
-            else
-                package:add("deps", "openssl", "protobuf-cpp")
-            end
+            package:add("deps", "openssl", "protobuf-cpp")
         end
     end)