From 5fa0348b20ed22d08c9e2060771e52a62e0fa421 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Jul 2013 20:52:29 +0100 Subject: [PATCH 1/4] Bump ThirdParty/Libs Added MacOS support for the ManagedPVRTC.dll --- ThirdParty/Libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ThirdParty/Libs b/ThirdParty/Libs index 6b3ed4b50bf..cf771830b1f 160000 --- a/ThirdParty/Libs +++ b/ThirdParty/Libs @@ -1 +1 @@ -Subproject commit 6b3ed4b50bf13e2e7f4eedd19911d15bd8556b8b +Subproject commit cf771830b1f438de22d850585b148a7848e4a451 From b12bd9410eaa52a3eaf086fd6aae53895db6beaf Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Jul 2013 20:57:50 +0100 Subject: [PATCH 2/4] Fixed location of pvrtc.dll's in the MonoGame.Framework.Content.Pipeline.Windows.csproj --- .../MonoGame.Framework.Content.Pipeline.Windows.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.Windows.csproj b/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.Windows.csproj index b4423e5f667..5f171cde69e 100644 --- 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 @@ - - Dependencies\x64\PVRTexLibWrapper.dll + + Dependencies\x64\pvrtc.dll PreserveNewest - - Dependencies\x86\PVRTexLibWrapper.dll + + Dependencies\x86\pvrtc.dll PreserveNewest From c1a7d252f1ee98b39ada92808cb198dc8f2e7dea Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Jul 2013 21:04:21 +0100 Subject: [PATCH 3/4] Fixed link to pvrtc.dll in MonoGameContentProcessors.csproj --- .../ContentProcessors/MonoGameContentProcessors.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj b/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj index f1607e305bf..cb0a5cb44bf 100644 --- a/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj +++ b/MonoGame.ContentPipeline/ContentProcessors/MonoGameContentProcessors.csproj @@ -185,8 +185,8 @@ - - PVRTexLibWrapper.dll + + pvrtc.dll PreserveNewest From 15ad006f09968ce78fbcf51c9ce8c5742144f231 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Jul 2013 21:09:28 +0100 Subject: [PATCH 4/4] Fixed the installer to pick up the new pvrtc.dll --- Installers/Windows/MonoGame.nsi | 2 +- Installers/default.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Installers/Windows/MonoGame.nsi b/Installers/Windows/MonoGame.nsi index 53bde33414f..dffdbcaf01d 100644 --- 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 index 44b87c108da..61b51ac05ac 100644 --- a/Installers/default.build +++ b/Installers/default.build @@ -11,7 +11,7 @@ !define FrameworkPath "${project::get-base-directory()}" -!define VERSION "3.0" +!define VERSION "3.2" !define REVISION "0.0"