Merge pull request MonoGame#1886 from dellis1972/develop

Bump ThirdParty/Libs Added MacOS support for the ManagedPVRTC.dll
danzel · Jul 24, 2013 · 226ec90 · 226ec90
2 parents 7a793b5 + 15ad006
commit 226ec90
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Installers/Windows/MonoGame.nsi b/Installers/Windows/MonoGame.nsi
@@ -88,7 +88,7 @@ Section "MonoGame Core Components" CoreComponents ;No components page, name is n
   File /nonfatal '..\..\ThirdParty\Libs\NAudio\*.txt'
   File '..\..\Tools\2MGFX\bin\Release\*.exe'
 
-  File '..\..\ThirdParty\Libs\ManagedPVRTC\x86\PVRTexLibWrapper.dll'
+  File '..\..\ThirdParty\Libs\ManagedPVRTC\x86\pvrtc.dll'
   File /oname=libmojoshader.dll  '..\..\ThirdParty\Libs\libmojoshader_32.dll'
   File '..\..\ThirdParty\Libs\lame_enc.dll'
 

diff --git a/Installers/default.build b/Installers/default.build
@@ -11,7 +11,7 @@
 
         <echo append="false" file="Windows/header.nsh">
 !define FrameworkPath "${project::get-base-directory()}"
-!define VERSION "3.0"
+!define VERSION "3.2"
 !define REVISION "0.0"
         </echo>
         <exec program="makensis" workingdir="Windows" basedir="C:\Program Files (x86)\NSIS">

diff --git a/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj b/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj
@@ -185,8 +185,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\ThirdParty\Libs\ManagedPVRTC\x86\PVRTexLibWrapper.dll">
-      <Link>PVRTexLibWrapper.dll</Link>
+    <None Include="..\..\ThirdParty\Libs\ManagedPVRTC\x86\pvrtc.dll">
+      <Link>pvrtc.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.Windows.csproj b/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.Windows.csproj
@@ -317,14 +317,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\ThirdParty\Libs\ManagedPVRTC\x64\PVRTexLibWrapper.dll">
-      <Link>Dependencies\x64\PVRTexLibWrapper.dll</Link>
+    <None Include="..\ThirdParty\Libs\ManagedPVRTC\x64\pvrtc.dll">
+      <Link>Dependencies\x64\pvrtc.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\ThirdParty\Libs\ManagedPVRTC\x86\PVRTexLibWrapper.dll">
-      <Link>Dependencies\x86\PVRTexLibWrapper.dll</Link>
+    <None Include="..\ThirdParty\Libs\ManagedPVRTC\x86\pvrtc.dll">
+      <Link>Dependencies\x86\pvrtc.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/ThirdParty/Libs b/ThirdParty/Libs