From e3ac585144a8ff352979eb5d3533b34ec35f048f Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Sat, 22 Feb 2020 21:45:26 +0000 Subject: [PATCH] No need for posix32/64 now - combined to just posix --- Facepunch.Steamworks.sln | 16 +-------- ...proj => Facepunch.Steamworks.Posix.csproj} | 4 +-- .../Facepunch.Steamworks.Win32.csproj | 2 +- Facepunch.Steamworks/Utility/Platform.cs | 10 ++---- UnityPlugin/Facepunch.Steamworks.dll.meta | 33 ------------------- UnityPlugin/Facepunch.Steamworks.pdb.meta | 7 ---- UnityPlugin/Facepunch.Steamworks.xml.meta | 7 ---- 7 files changed, 6 insertions(+), 73 deletions(-) rename Facepunch.Steamworks/{Facepunch.Steamworks.Posix32.csproj => Facepunch.Steamworks.Posix.csproj} (73%) delete mode 100644 UnityPlugin/Facepunch.Steamworks.dll.meta delete mode 100644 UnityPlugin/Facepunch.Steamworks.pdb.meta delete mode 100644 UnityPlugin/Facepunch.Steamworks.xml.meta diff --git a/Facepunch.Steamworks.sln b/Facepunch.Steamworks.sln index 62426b9..26ca56b 100644 --- a/Facepunch.Steamworks.sln +++ b/Facepunch.Steamworks.sln @@ -7,11 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Gene EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Win64", "Facepunch.Steamworks\Facepunch.Steamworks.Win64.csproj", "{8C73DA93-73AD-4445-9A2C-15D4A44337D3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix64", "Facepunch.Steamworks\Facepunch.Steamworks.Posix64.csproj", "{12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Win32", "Facepunch.Steamworks\Facepunch.Steamworks.Win32.csproj", "{2D6247F6-8AB2-405F-A00E-3A364B808A55}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix32", "Facepunch.Steamworks\Facepunch.Steamworks.Posix32.csproj", "{C62FF421-BE44-4DB0-B99A-E13E007A30B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix", "Facepunch.Steamworks\Facepunch.Steamworks.Posix.csproj", "{C62FF421-BE44-4DB0-B99A-E13E007A30B9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.TestWin32", "Facepunch.Steamworks.Test\Facepunch.Steamworks.TestWin32.csproj", "{3F6183AD-D966-44F2-A6EB-42E61E591B49}" EndProject @@ -51,18 +49,6 @@ Global {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Release|x64.Build.0 = Release|Any CPU {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Release|x86.ActiveCfg = Release|Any CPU {8C73DA93-73AD-4445-9A2C-15D4A44337D3}.Release|x86.Build.0 = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|x64.ActiveCfg = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|x64.Build.0 = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|x86.ActiveCfg = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Debug|x86.Build.0 = Debug|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|Any CPU.Build.0 = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|x64.ActiveCfg = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|x64.Build.0 = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|x86.ActiveCfg = Release|Any CPU - {12478BAE-7C1F-4FFD-B903-E1DDA6426DDF}.Release|x86.Build.0 = Release|Any CPU {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Debug|Any CPU.Build.0 = Debug|Any CPU {2D6247F6-8AB2-405F-A00E-3A364B808A55}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj similarity index 73% rename from Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj rename to Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj index e0ef778..0a0e3c5 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Posix32.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj @@ -1,8 +1,8 @@  - Facepunch.Steamworks.Posix32 - $(DefineConstants);PLATFORM_POSIX32;PLATFORM_POSIX;PLATFORM_32 + Facepunch.Steamworks.Posix + $(DefineConstants);PLATFORM_POSIX netstandard2.0;net46 true 7.1 diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj index ce68aa0..3e00781 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj @@ -2,7 +2,7 @@ Facepunch.Steamworks.Win32 - $(DefineConstants);PLATFORM_WIN32;PLATFORM_WIN;PLATFORM_32 + $(DefineConstants);PLATFORM_WIN32;PLATFORM_WIN netstandard2.0;net46 true 7.1 diff --git a/Facepunch.Steamworks/Utility/Platform.cs b/Facepunch.Steamworks/Utility/Platform.cs index 1dec3f1..d573dab 100644 --- a/Facepunch.Steamworks/Utility/Platform.cs +++ b/Facepunch.Steamworks/Utility/Platform.cs @@ -13,21 +13,15 @@ internal static class Platform #if PLATFORM_WIN64 public const int StructPlatformPackSize = 8; public const string LibraryName = "steam_api64"; - public const CallingConvention CC = CallingConvention.Cdecl; #elif PLATFORM_WIN32 public const int StructPlatformPackSize = 8; public const string LibraryName = "steam_api"; - public const CallingConvention CC = CallingConvention.Cdecl; -#elif PLATFORM_POSIX32 +#elif PLATFORM_POSIX public const int StructPlatformPackSize = 4; public const string LibraryName = "libsteam_api"; - public const CallingConvention CC = CallingConvention.Cdecl; -#elif PLATFORM_POSIX64 - public const int StructPlatformPackSize = 4; - public const string LibraryName = "libsteam_api"; - public const CallingConvention CC = CallingConvention.Cdecl; #endif + public const CallingConvention CC = CallingConvention.Cdecl; public const int StructPackSize = 4; } } diff --git a/UnityPlugin/Facepunch.Steamworks.dll.meta b/UnityPlugin/Facepunch.Steamworks.dll.meta deleted file mode 100644 index ac818be..0000000 --- a/UnityPlugin/Facepunch.Steamworks.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: a8f68628902ac4949919f2f5865f15c2 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityPlugin/Facepunch.Steamworks.pdb.meta b/UnityPlugin/Facepunch.Steamworks.pdb.meta deleted file mode 100644 index c16fa0e..0000000 --- a/UnityPlugin/Facepunch.Steamworks.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: dd29afd67a2b68243b283f848e393b97 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityPlugin/Facepunch.Steamworks.xml.meta b/UnityPlugin/Facepunch.Steamworks.xml.meta deleted file mode 100644 index f6becc8..0000000 --- a/UnityPlugin/Facepunch.Steamworks.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 238ade710c967c74bb035e6179469ddd -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: