64 bit support for Windows and Linux

rlabrecque · Feb 18, 2014 · fcaf938 · fcaf938
1 parent 2a2aa48
commit fcaf938
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 31 deletions.
diff --git a/Editor/Steamworks.NET/RedistCopy.cs b/Editor/Steamworks.NET/RedistCopy.cs
@@ -14,20 +14,33 @@ public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProj
 #if !DISABLEREDISTCOPY
 		string strProjectName = Path.GetFileNameWithoutExtension(pathToBuiltProject);
 
-		if (target == BuildTarget.StandaloneWindows) {
-			CopyFile("steam_api.dll", "steam_api.dll", pathToBuiltProject);
+		switch(target) {
+			case BuildTarget.StandaloneWindows:
+				CopyFile("steam_api.dll", "steam_api.dll", pathToBuiltProject);
+				break;
+			case BuildTarget.StandaloneWindows64:
+				CopyFile("steam_api64.dll", "steam_api64.dll", pathToBuiltProject);
+				break;
+			case BuildTarget.StandaloneLinux:
+				CopyFile("linux/launchscript", strProjectName, pathToBuiltProject);
+				break;
+			case BuildTarget.StandaloneLinux64:
+				CopyFile("linux/launchscript64", strProjectName, pathToBuiltProject);
+				break;
+			case BuildTarget.StandaloneLinuxUniversal:
+				CopyFile("linux/launchscriptuniversal", strProjectName, pathToBuiltProject);
+				break;
+			case BuildTarget.StandaloneOSXIntel:
+				break;
+			default:
+				Debug.Log(string.Format("[Steamworks.NET] {0} Is not a supported platform.", target));
+				return;
 		}
-		else if (target == BuildTarget.StandaloneLinux || target == BuildTarget.StandaloneLinux64 || target == BuildTarget.StandaloneLinuxUniversal) {
-			CopyFile("linux/launchscript", strProjectName, pathToBuiltProject);
-		}
-		else {
-			Debug.Log(string.Format("[Steamworks.NET] {0} Is not a supported platform.", target));
-		}
-
+
 		string controllerCfg = Path.Combine(Application.dataPath, "controller.vdf");
 		if (File.Exists(controllerCfg)) {
 			string dir = "_Data";
-			if (target == BuildTarget.StandaloneOSXIntel || target == BuildTarget.StandaloneOSXIntel64 || target == BuildTarget.StandaloneOSXUniversal) {
+			if (target == BuildTarget.StandaloneOSXIntel) {
 				dir = ".app/Contents";
 			}
 

diff --git a/Editor/Steamworks.NET/x86_64Warning.cs b/Editor/Steamworks.NET/x86_64Warning.cs
diff --git a/Plugins/CSteamworks.bundle/Contents/MacOS/CSteamworks b/Plugins/CSteamworks.bundle/Contents/MacOS/CSteamworks
diff --git a/Plugins/Steamworks.NET/redist/linux/launchscript b/Plugins/Steamworks.NET/redist/linux/launchscript
@@ -1,3 +1,8 @@
-#!/bin/sh
-export LD_LIBRARY_PATH="./REPLACEWITHYOURGAMENAME_Data/Plugins/x86/:$LD_LIBRARY_PATH"
-exec ./REPLACEWITHYOURGAMENAME.x86 "$@"
+#!/usr/bin/env bash
+
+GAMENAME="REPLACEWITHYOURGAMENAME"
+ARCH="x86"
+
+export LD_LIBRARY_PATH="./"$GAMENAME"_Data/Plugins/"$ARCH"/:$LD_LIBRARY_PATH"
+
+exec "./"$GAMENAME"."$ARCH "$@"
diff --git a/Plugins/Steamworks.NET/redist/linux/launchscript64 b/Plugins/Steamworks.NET/redist/linux/launchscript64
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+GAMENAME="REPLACEWITHYOURGAMENAME"
+ARCH="x86_64"
+
+export LD_LIBRARY_PATH="./"$GAMENAME"_Data/Plugins/"$ARCH"/:$LD_LIBRARY_PATH"
+
+exec "./"$GAMENAME"."$ARCH "$@"
diff --git a/Plugins/Steamworks.NET/redist/linux/launchscriptuniversal b/Plugins/Steamworks.NET/redist/linux/launchscriptuniversal
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+GAMENAME="REPLACEWITHYOURGAMENAME"
+ARCH=`uname -m`
+
+if [ "$ARCH" != "x86_64" ]; then
+	ARCH="x86"
+fi
+
+export LD_LIBRARY_PATH="./"$GAMENAME"_Data/Plugins/"$ARCH"/:$LD_LIBRARY_PATH"
+
+exec "./"$GAMENAME"."$ARCH "$@"
diff --git a/Plugins/Steamworks.NET/redist/steam_api64.dll b/Plugins/Steamworks.NET/redist/steam_api64.dll
diff --git a/Plugins/x86/libCSteamworks.so b/Plugins/x86/libCSteamworks.so
diff --git a/Plugins/x86_64/CSteamworks.dll b/Plugins/x86_64/CSteamworks.dll
diff --git a/Plugins/x86_64/libCSteamworks.so b/Plugins/x86_64/libCSteamworks.so
diff --git a/Plugins/x86_64/libsteam_api.so b/Plugins/x86_64/libsteam_api.so