From 7981877799136b0e31ce238a242315392045839d Mon Sep 17 00:00:00 2001 From: Manu Date: Thu, 30 Jun 2016 15:53:15 +0900 Subject: [PATCH] Added Linux build to avoid the need of a DllMap config file which doesn't work with CoreCLR on Linux --- SDL2-CS.csproj | 21 +++++++++++++++++++++ SDL2-CS.sln | 15 +++++++++++---- src/SDL2.cs | 4 ++++ src/SDL2_image.cs | 4 ++++ src/SDL2_mixer.cs | 4 ++++ src/SDL2_ttf.cs | 4 ++++ 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/SDL2-CS.csproj b/SDL2-CS.csproj index 306d0f7..179e562 100644 --- a/SDL2-CS.csproj +++ b/SDL2-CS.csproj @@ -54,6 +54,27 @@ true false + + true + full + false + bin\Debug + DEBUG;SDL_LINUX + prompt + 4 + false + true + + + none + false + bin\Release + SDL_LINUX + prompt + 4 + true + false + true full diff --git a/SDL2-CS.sln b/SDL2-CS.sln index 80749a7..5945337 100644 --- a/SDL2-CS.sln +++ b/SDL2-CS.sln @@ -1,27 +1,34 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL2-CS", "SDL2-CS.csproj", "{85480198-8711-4355-830E-72FD794AD3F6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|Linux = Debug|Linux Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|Linux = Release|Linux Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Any CPU.ActiveCfg = Debug|Linux + {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Any CPU.Build.0 = Debug|Linux + {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Linux.ActiveCfg = Debug|Linux + {85480198-8711-4355-830E-72FD794AD3F6}.Debug|Linux.Build.0 = Debug|Linux {85480198-8711-4355-830E-72FD794AD3F6}.Debug|x64.ActiveCfg = Debug|x64 {85480198-8711-4355-830E-72FD794AD3F6}.Debug|x64.Build.0 = Debug|x64 {85480198-8711-4355-830E-72FD794AD3F6}.Debug|x86.ActiveCfg = Debug|x86 {85480198-8711-4355-830E-72FD794AD3F6}.Debug|x86.Build.0 = Debug|x86 {85480198-8711-4355-830E-72FD794AD3F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {85480198-8711-4355-830E-72FD794AD3F6}.Release|Any CPU.Build.0 = Release|Any CPU + {85480198-8711-4355-830E-72FD794AD3F6}.Release|Linux.ActiveCfg = Release|Linux + {85480198-8711-4355-830E-72FD794AD3F6}.Release|Linux.Build.0 = Release|Linux {85480198-8711-4355-830E-72FD794AD3F6}.Release|x64.ActiveCfg = Release|x64 {85480198-8711-4355-830E-72FD794AD3F6}.Release|x64.Build.0 = Release|x64 {85480198-8711-4355-830E-72FD794AD3F6}.Release|x86.ActiveCfg = Release|x86 diff --git a/src/SDL2.cs b/src/SDL2.cs index 1ee9846..feeb105 100644 --- a/src/SDL2.cs +++ b/src/SDL2.cs @@ -43,7 +43,11 @@ namespace SDL2 /// /// Used by DllImport to load the native library. /// +#if SDL_LINUX + private const string nativeLibName = "libSDL2-2.0.so"; +#else private const string nativeLibName = "SDL2.dll"; +#endif #endregion diff --git a/src/SDL2_image.cs b/src/SDL2_image.cs index a6a438a..fac465f 100644 --- a/src/SDL2_image.cs +++ b/src/SDL2_image.cs @@ -38,7 +38,11 @@ namespace SDL2 #region SDL2# Variables /* Used by DllImport to load the native library. */ +#if SDL_LINUX + private const string nativeLibName = "libSDL2_image-2.0.so"; +#else private const string nativeLibName = "SDL2_image.dll"; +#endif #endregion diff --git a/src/SDL2_mixer.cs b/src/SDL2_mixer.cs index 2f55347..fe024d1 100644 --- a/src/SDL2_mixer.cs +++ b/src/SDL2_mixer.cs @@ -38,7 +38,11 @@ namespace SDL2 #region SDL2# Variables /* Used by DllImport to load the native library. */ +#if SDL_LINUX + private const string nativeLibName = "libSDL2_mixer-2.0.so"; +#else private const string nativeLibName = "SDL2_mixer.dll"; +#endif #endregion diff --git a/src/SDL2_ttf.cs b/src/SDL2_ttf.cs index 0c85ae8..e71fc52 100644 --- a/src/SDL2_ttf.cs +++ b/src/SDL2_ttf.cs @@ -38,7 +38,11 @@ namespace SDL2 #region SDL2# Variables /* Used by DllImport to load the native library. */ +#if SDL_LINUX + private const string nativeLibName = "libSDL2_ttf-2.0.so"; +#else private const string nativeLibName = "SDL2_ttf.dll"; +#endif #endregion