GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2024-12-24 13:45:37 +03:00
Code Issues Projects Releases Wiki Activity

64bit only

Browse Source
This commit is contained in:
Garry Newman 2019-04-11 16:18:08 +01:00
parent 4b9eba285a
commit 15b04eec2a
32 changed files with 69 additions and 10268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Facepunch.Steamworks/Config.cs
View File

@ -20,22 +20,21 @@ public static void ForUnity( string platform )
// //
if (IntPtr.Size == 4) UseThisCall = false; if (IntPtr.Size == 4) UseThisCall = false;
ForcePlatform( OperatingSystem.Windows, IntPtr.Size == 4 ? Architecture.x86 : Architecture.x64 ); ForcePlatform( OperatingSystem.Windows );
} }
if ( platform == "OSXEditor" || platform == "OSXPlayer" || platform == "OSXDashboardPlayer" ) if ( platform == "OSXEditor" || platform == "OSXPlayer" || platform == "OSXDashboardPlayer" )
{ {
ForcePlatform( OperatingSystem.macOS, IntPtr.Size == 4 ? Architecture.x86 : Architecture.x64 ); ForcePlatform( OperatingSystem.macOS );
} }
if ( platform == "LinuxPlayer" || platform == "LinuxEditor" ) if ( platform == "LinuxPlayer" || platform == "LinuxEditor" )
{ {
ForcePlatform( OperatingSystem.Linux, IntPtr.Size == 4 ? Architecture.x86 : Architecture.x64 ); ForcePlatform( OperatingSystem.Linux );
} }
Console.WriteLine( "Facepunch.Steamworks Unity: " + platform ); Console.WriteLine( "Facepunch.Steamworks Unity: " + platform );
Console.WriteLine( "Facepunch.Steamworks Os: " + SteamNative.Platform.Os ); Console.WriteLine( "Facepunch.Steamworks Os: " + SteamNative.Platform.Os );
Console.WriteLine( "Facepunch.Steamworks Arch: " + SteamNative.Platform.Arch );
} }
/// <summary> /// <summary>
@ -55,10 +54,9 @@ public static void ForUnity( string platform )
/// This is useful if you're on OSX because some versions of mono don't have a way /// This is useful if you're on OSX because some versions of mono don't have a way
/// to tell which platform we're running /// to tell which platform we're running
/// </summary> /// </summary>
public static void ForcePlatform( Facepunch.Steamworks.OperatingSystem os, Facepunch.Steamworks.Architecture arch ) public static void ForcePlatform( Facepunch.Steamworks.OperatingSystem os )
{ {
SteamNative.Platform.Os = os; SteamNative.Platform.Os = os;
SteamNative.Platform.Arch = arch;
} }
} }

5063
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Linux32.cs
View File

File diff suppressed because it is too large Load Diff

4
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Linux64.cs
View File

@ -6,7 +6,7 @@ namespace SteamNative
{ {
internal static partial class Platform internal static partial class Platform
{ {
internal class Linux64 : Interface internal class Linux : Interface
{ {
internal IntPtr _ptr; internal IntPtr _ptr;
public bool IsValid { get{ return _ptr != IntPtr.Zero; } } public bool IsValid { get{ return _ptr != IntPtr.Zero; } }
@ -14,7 +14,7 @@ internal class Linux64 : Interface
// //
// Constructor sets pointer to native class // Constructor sets pointer to native class
// //
internal Linux64( IntPtr pointer ) internal Linux( IntPtr pointer )
{ {
_ptr = pointer; _ptr = pointer;
} }

5029
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Win32.cs
View File

File diff suppressed because it is too large Load Diff

4
Facepunch.Steamworks/SteamNative/SteamNative.Platform.Win64.cs
View File

@ -6,7 +6,7 @@ namespace SteamNative
{ {
internal static partial class Platform internal static partial class Platform
{ {
internal class Win64 : Interface internal class Windows : Interface
{ {
internal IntPtr _ptr; internal IntPtr _ptr;
public bool IsValid { get{ return _ptr != IntPtr.Zero; } } public bool IsValid { get{ return _ptr != IntPtr.Zero; } }
@ -14,7 +14,7 @@ internal class Win64 : Interface
// //
// Constructor sets pointer to native class // Constructor sets pointer to native class
// //
internal Win64( IntPtr pointer ) internal Windows( IntPtr pointer )
{ {
_ptr = pointer; _ptr = pointer;
} }

51
Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs
View File

@ -11,13 +11,6 @@ public enum OperatingSystem
Linux, Linux,
macOS, macOS,
} }
public enum Architecture
{
Unset,
x86,
x64
}
} }
namespace SteamNative namespace SteamNative
@ -25,7 +18,6 @@ namespace SteamNative
internal static partial class Platform internal static partial class Platform
{ {
private static Facepunch.Steamworks.OperatingSystem _os; private static Facepunch.Steamworks.OperatingSystem _os;
private static Facepunch.Steamworks.Architecture _arch;
public static Facepunch.Steamworks.OperatingSystem RunningPlatform() public static Facepunch.Steamworks.OperatingSystem RunningPlatform()
{ {
@ -71,43 +63,14 @@ internal static Facepunch.Steamworks.OperatingSystem Os
} }
} }
internal static Facepunch.Steamworks.Architecture Arch public static bool IsWindows => Os == Facepunch.Steamworks.OperatingSystem.Windows;
{ public static bool IsLinux => Os == Facepunch.Steamworks.OperatingSystem.Linux;
get public static bool IsOsx => Os == Facepunch.Steamworks.OperatingSystem.macOS;
{
//
// Work out whether we're 64bit or 32bit
//
if ( _arch == Facepunch.Steamworks.Architecture.Unset )
{
if ( IntPtr.Size == 8 )
_arch = Facepunch.Steamworks.Architecture.x64;
else if ( IntPtr.Size == 4 )
_arch = Facepunch.Steamworks.Architecture.x86;
else
throw new System.Exception( "Unsupported Architecture!" );
}
return _arch;
}
set
{
_arch = value;
}
}
public static bool IsWindows { get { return Os == Facepunch.Steamworks.OperatingSystem.Windows; } }
public static bool IsWindows64 { get { return Arch == Facepunch.Steamworks.Architecture.x64 && IsWindows; } }
public static bool IsWindows32 { get { return Arch == Facepunch.Steamworks.Architecture.x86 && IsWindows; } }
public static bool IsLinux64 { get { return Arch == Facepunch.Steamworks.Architecture.x64 && Os == Facepunch.Steamworks.OperatingSystem.Linux; } }
public static bool IsLinux32 { get { return Arch == Facepunch.Steamworks.Architecture.x86 && Os == Facepunch.Steamworks.OperatingSystem.Linux; } }
public static bool IsOsx { get { return Os == Facepunch.Steamworks.OperatingSystem.macOS; } }
/// <summary> /// <summary>
/// We're only Pack = 8 on Windows /// We're only Pack = 8 on Windows
/// </summary> /// </summary>
public static bool PackSmall { get { return Os != Facepunch.Steamworks.OperatingSystem.Windows; } } public static bool PackSmall => Os != Facepunch.Steamworks.OperatingSystem.Windows;
} }
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamApi.cs
View File

@ -17,10 +17,8 @@ internal unsafe class SteamApi : IDisposable
internal SteamApi() internal SteamApi()
{ {
if ( Platform.IsWindows64 ) platform = new Platform.Win64( ((IntPtr)1) ); if ( Platform.IsWindows ) platform = new Platform.Windows( ((IntPtr)1) );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( ((IntPtr)1) ); else if ( Platform.IsLinux ) platform = new Platform.Linux( ((IntPtr)1) );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( ((IntPtr)1) );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( ((IntPtr)1) );
else if ( Platform.IsOsx ) platform = new Platform.Mac( ((IntPtr)1) ); else if ( Platform.IsOsx ) platform = new Platform.Mac( ((IntPtr)1) );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamAppList.cs
View File

@ -19,10 +19,8 @@ internal SteamAppList( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr po
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamApps.cs
View File

@ -19,10 +19,8 @@ internal SteamApps( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr point
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamClient.cs
View File

@ -19,10 +19,8 @@ internal SteamClient( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr poi
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamController.cs
View File

@ -19,10 +19,8 @@ internal SteamController( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamFriends.cs
View File

@ -19,10 +19,8 @@ internal SteamFriends( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr po
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamGameServer.cs
View File

@ -19,10 +19,8 @@ internal SteamGameServer( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamGameServerStats.cs
View File

@ -19,10 +19,8 @@ internal SteamGameServerStats( Facepunch.Steamworks.BaseSteamworks steamworks, I
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamHTMLSurface.cs
View File

@ -19,10 +19,8 @@ internal SteamHTMLSurface( Facepunch.Steamworks.BaseSteamworks steamworks, IntPt
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamHTTP.cs
View File

@ -19,10 +19,8 @@ internal SteamHTTP( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr point
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamInventory.cs
View File

@ -19,10 +19,8 @@ internal SteamInventory( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamMatchmaking.cs
View File

@ -19,10 +19,8 @@ internal SteamMatchmaking( Facepunch.Steamworks.BaseSteamworks steamworks, IntPt
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamMatchmakingServers.cs
View File

@ -19,10 +19,8 @@ internal SteamMatchmakingServers( Facepunch.Steamworks.BaseSteamworks steamworks
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamMusic.cs
View File

@ -19,10 +19,8 @@ internal SteamMusic( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr poin
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamMusicRemote.cs
View File

@ -19,10 +19,8 @@ internal SteamMusicRemote( Facepunch.Steamworks.BaseSteamworks steamworks, IntPt
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamNetworking.cs
View File

@ -19,10 +19,8 @@ internal SteamNetworking( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamParentalSettings.cs
View File

@ -19,10 +19,8 @@ internal SteamParentalSettings( Facepunch.Steamworks.BaseSteamworks steamworks,
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamRemoteStorage.cs
View File

@ -19,10 +19,8 @@ internal SteamRemoteStorage( Facepunch.Steamworks.BaseSteamworks steamworks, Int
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamScreenshots.cs
View File

@ -19,10 +19,8 @@ internal SteamScreenshots( Facepunch.Steamworks.BaseSteamworks steamworks, IntPt
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamUGC.cs
View File

@ -19,10 +19,8 @@ internal SteamUGC( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr pointe
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamUser.cs
View File

@ -19,10 +19,8 @@ internal SteamUser( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr point
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamUserStats.cs
View File

@ -19,10 +19,8 @@ internal SteamUserStats( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamUtils.cs
View File

@ -19,10 +19,8 @@ internal SteamUtils( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr poin
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

6
Facepunch.Steamworks/SteamNative/SteamNative.SteamVideo.cs
View File

@ -19,10 +19,8 @@ internal SteamVideo( Facepunch.Steamworks.BaseSteamworks steamworks, IntPtr poin
{ {
this.steamworks = steamworks; this.steamworks = steamworks;
if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer ); if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );
else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer ); else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );
else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );
else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );
else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer ); else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );
} }

12
Generator/CodeWriter/Class.cs
View File

@ -58,10 +58,8 @@ private void Class( string classname, SteamApiDefinition.MethodDef[] methodDef )
StartBlock( $"internal {InterfaceNameToClass( classname )}()" ); StartBlock( $"internal {InterfaceNameToClass( classname )}()" );
{ {
WriteLine( "" ); WriteLine( "" );
WriteLine( "if ( Platform.IsWindows64 ) platform = new Platform.Win64( ((IntPtr)1) );" ); WriteLine( "if ( Platform.IsWindows ) platform = new Platform.Windows( ((IntPtr)1) );" );
WriteLine( "else if ( Platform.IsWindows32 ) platform = new Platform.Win32( ((IntPtr)1) );" ); WriteLine( "else if ( Platform.IsLinux ) platform = new Platform.Linux( ((IntPtr)1) );" );
WriteLine( "else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( ((IntPtr)1) );" );
WriteLine( "else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( ((IntPtr)1) );" );
WriteLine( "else if ( Platform.IsOsx ) platform = new Platform.Mac( ((IntPtr)1) );" ); WriteLine( "else if ( Platform.IsOsx ) platform = new Platform.Mac( ((IntPtr)1) );" );
} }
EndBlock(); EndBlock();
@ -72,10 +70,8 @@ private void Class( string classname, SteamApiDefinition.MethodDef[] methodDef )
{ {
WriteLine( "this.steamworks = steamworks;" ); WriteLine( "this.steamworks = steamworks;" );
WriteLine( "" ); WriteLine( "" );
WriteLine( "if ( Platform.IsWindows64 ) platform = new Platform.Win64( pointer );" ); WriteLine( "if ( Platform.IsWindows ) platform = new Platform.Windows( pointer );" );
WriteLine( "else if ( Platform.IsWindows32 ) platform = new Platform.Win32( pointer );" ); WriteLine( "else if ( Platform.IsLinux ) platform = new Platform.Linux( pointer );" );
WriteLine( "else if ( Platform.IsLinux32 ) platform = new Platform.Linux32( pointer );" );
WriteLine( "else if ( Platform.IsLinux64 ) platform = new Platform.Linux64( pointer );" );
WriteLine( "else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );" ); WriteLine( "else if ( Platform.IsOsx ) platform = new Platform.Mac( pointer );" );
} }
EndBlock(); EndBlock();

20
Generator/CodeWriter/CodeWriter.cs
View File

@ -63,15 +63,7 @@ public void ToFolder( string folder )
{ {
sb = new StringBuilder(); sb = new StringBuilder();
Header(); Header();
PlatformClass( "Win32", "steam_api.dll", true ); PlatformClass( "Windows", "steam_api64.dll", true );
Footer();
System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Win32.cs", sb.ToString() );
}
{
sb = new StringBuilder();
Header();
PlatformClass( "Win64", "steam_api64.dll", true );
Footer(); Footer();
System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Win64.cs", sb.ToString() ); System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Win64.cs", sb.ToString() );
} }
@ -79,15 +71,7 @@ public void ToFolder( string folder )
{ {
sb = new StringBuilder(); sb = new StringBuilder();
Header(); Header();
PlatformClass( "Linux32", "libsteam_api.so", false ); PlatformClass( "Linux", "libsteam_api64.so", false );
Footer();
System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Linux32.cs", sb.ToString() );
}
{
sb = new StringBuilder();
Header();
PlatformClass( "Linux64", "libsteam_api64.so", false );
Footer(); Footer();
System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Linux64.cs", sb.ToString() ); System.IO.File.WriteAllText( $"{folder}SteamNative.Platform.Linux64.cs", sb.ToString() );
} }