[MacOS] libSDL dylib instead of SDL.framework which

can't be properly signed for AppStore distrib
SupergiantGames · Apr 10, 2012 · 78c4807 · 78c4807
1 parent 7c7dd29
commit 78c4807
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/MonoGame.Framework/MonoGame.Framework.MacOS.csproj b/MonoGame.Framework/MonoGame.Framework.MacOS.csproj
@@ -383,7 +383,6 @@
     <Folder Include="MacOS\Input\" />
     <Folder Include="MacOS\GamerServices\" />
     <Folder Include="MacOS\Storage\" />
-    <Folder Include="SDL.framework\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ThirdParty\Lidgren.Network\Lidgren.Network.MacOS.csproj">
@@ -396,18 +395,6 @@
       <Link>libfmodex_i386.dylib</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\ThirdParty\GamepadConfig\SDL.framework\SDL">
-      <Link>SDL.framework\SDL</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\GamepadConfig\SDL.framework\Versions\Current\SDL">
-      <Link>SDL.framework\Versions\Current\SDL</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\ThirdParty\GamepadConfig\SDL.framework\Versions\A\SDL">
-      <Link>SDL.framework\Versions\A\SDL</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\ThirdParty\GamepadConfig\Xbox 360 Gamepad.xml">
       <Link>Xbox 360 Gamepad.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -416,5 +403,9 @@
       <Link>PS3 Gamepad.xml</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\ThirdParty\GamepadConfig\libSDL-1.2.0.dylib">
+      <Link>libSDL-1.2.0.dylib</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/ThirdParty/GamepadConfig/SDL.framework/SDL b/ThirdParty/GamepadConfig/SDL.framework/SDL
diff --git a/ThirdParty/GamepadConfig/SDL.framework/Versions/A/SDL b/ThirdParty/GamepadConfig/SDL.framework/Versions/A/SDL
diff --git a/ThirdParty/GamepadConfig/SDL.framework/Versions/Current/SDL b/ThirdParty/GamepadConfig/SDL.framework/Versions/Current/SDL
diff --git a/ThirdParty/GamepadConfig/Tao.Sdl.dll.config b/ThirdParty/GamepadConfig/Tao.Sdl.dll.config
@@ -1,6 +1,6 @@
 <configuration>
     <dllmap dll="SDL.dll" os="windows" target="SDL.dll"/>
-    <dllmap dll="SDL.dll" os="osx" target="SDL.framework/SDL" />
+    <dllmap dll="SDL.dll" os="osx" target="libSDL-1.2.0.dylib" />
     <dllmap dll="SDL.dll" os="!windows,osx" target="libSDL-1.2.so.0"/>
 
     <dllmap dll="SDL_image.dll" os="windows" target="SDL_image.dll"/>

diff --git a/ThirdParty/GamepadConfig/libSDL-1.2.0.dylib b/ThirdParty/GamepadConfig/libSDL-1.2.0.dylib