Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2860] trunk/OpenMPT
|
From: <man...@us...> - 2013-10-11 10:38:48
|
Revision: 2860
http://sourceforge.net/p/modplug/code/2860
Author: manxorist
Date: 2013-10-11 10:38:42 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
[New] libopenmpt: Support building with miniz instead of zlib to facilitate easier cross-compiling because no libopenmpt depends on no other library when using miniz.
[Mod] libopenmpt: Build libopenmpt on windows with miniz. This simplifies the build process somehow.
Modified Paths:
--------------
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/libopenmpt/libopenmpt.sln
trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln
trunk/OpenMPT/openmpt123/Makefile
trunk/OpenMPT/openmpt123/openmpt123.sln
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/common/BuildSettings.h 2013-10-11 10:38:42 UTC (rev 2860)
@@ -112,6 +112,9 @@
// Define to build without zlib support
//#define NO_ZLIB
+// Define to build without miniz support
+#define NO_MINIZ
+
// Define to build without MP3 import support (via mpg123)
//#define NO_MP3_SAMPLES
@@ -152,7 +155,10 @@
#endif
#define NO_DSOUND
#define NO_FLAC
-//#define NO_ZLIB
+#if !defined(MPT_WITH_ZLIB)
+#define NO_ZLIB
+#endif
+//#define NO_MINIZ
#define NO_MP3_SAMPLES
//#define NO_LIBMODPLUG
#if !defined(_WIN32) || (defined(_WIN32) && !defined(_M_IX86))
@@ -187,6 +193,11 @@
#undef MODPLUG_NO_FILESAVE // tests recommend file saving
#endif
+#if !defined(NO_ZLIB) && !defined(NO_MINIZ)
+// Only one deflate implementation should be used. Prefer zlib.
+#define NO_MINIZ
+#endif
+
#if defined(MPT_PLATFORM_BIG_ENDIAN) && !defined(MODPLUG_NO_FILESAVE)
#define MODPLUG_NO_FILESAVE // file saving is broken on big endian
#endif
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.sln
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.sln 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.sln 2013-10-11 10:38:42 UTC (rev 2860)
@@ -8,8 +8,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt_settings", "libopenmpt_settings.vcxproj", "{B2B6EE07-F662-496D-980C-FCA7CA144DBC}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\include\zlib\zlib.vcxproj", "{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -41,18 +39,6 @@
{B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|Win32.ActiveCfg = Release|Win32
{B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|Win32.Build.0 = Release|Win32
{B2B6EE07-F662-496D-980C-FCA7CA144DBC}.Test|x64.ActiveCfg = Release|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.ActiveCfg = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.ActiveCfg = DebugLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.Build.0 = DebugLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.ActiveCfg = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.ActiveCfg = ReleaseLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.Build.0 = ReleaseLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Test|Win32.ActiveCfg = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Test|Win32.Build.0 = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Test|x64.ActiveCfg = ReleaseLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Test|x64.Build.0 = ReleaseLib|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj 2013-10-11 10:38:42 UTC (rev 2860)
@@ -254,7 +254,6 @@
<OptimizeReferences>true</OptimizeReferences>
<DelayLoadDLLs>
</DelayLoadDLLs>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PreBuildEvent>
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
@@ -289,7 +288,6 @@
<DelayLoadDLLs>
</DelayLoadDLLs>
<SubSystem>Console</SubSystem>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PreBuildEvent>
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
@@ -318,7 +316,6 @@
<OptimizeReferences>true</OptimizeReferences>
<DelayLoadDLLs>
</DelayLoadDLLs>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PreBuildEvent>
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
@@ -351,7 +348,6 @@
<DelayLoadDLLs>
</DelayLoadDLLs>
<SubSystem>Console</SubSystem>
- <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PreBuildEvent>
<Command>subwcrev .. ..\common\svn_version_subwcrev\svn_version.template.h ..\common\svn_version_subwcrev\svn_version.h || del ..\common\svn_version_subwcrev\svn_version.h || true</Command>
@@ -495,6 +491,7 @@
<ClCompile Include="..\common\stdafx.cpp" />
<ClCompile Include="..\common\typedefs.cpp" />
<ClCompile Include="..\common\version.cpp" />
+ <ClCompile Include="..\include\miniz\miniz.c" />
<ClCompile Include="..\include\pugixml\src\pugixml.cpp" />
<ClCompile Include="..\soundlib\Dither.cpp" />
<ClCompile Include="..\soundlib\Dlsbank.cpp" />
@@ -585,11 +582,6 @@
<ClCompile Include="libopenmpt_winamp.cpp" />
<ClCompile Include="libopenmpt_xmplay.cpp" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\include\zlib\zlib.vcxproj">
- <Project>{1654fb18-fde6-406f-9d84-ba12bfbd67b2}</Project>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.vcxproj.filters 2013-10-11 10:38:42 UTC (rev 2860)
@@ -33,6 +33,9 @@
<Filter Include="Source Files\pugixml">
<UniqueIdentifier>{c229b22b-065f-42fd-81ee-498a859a7c8d}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\miniz">
+ <UniqueIdentifier>{3800b9bf-c28e-489f-8792-64b1b5a58b40}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\AudioCriticalSection.h">
@@ -511,5 +514,8 @@
<ClCompile Include="..\soundlib\Tagging.cpp">
<Filter>Source Files\soundlib</Filter>
</ClCompile>
+ <ClCompile Include="..\include\miniz\miniz.c">
+ <Filter>Source Files\miniz</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_foobar2000.sln 2013-10-11 10:38:42 UTC (rev 2860)
@@ -13,8 +13,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt.vcxproj", "{812A654D-99BE-4D13-B97F-86332AD3E363}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\include\zlib\zlib.vcxproj", "{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -45,10 +43,6 @@
{812A654D-99BE-4D13-B97F-86332AD3E363}.Debug|Win32.Build.0 = DebugStatic|Win32
{812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.ActiveCfg = ReleaseStatic|Win32
{812A654D-99BE-4D13-B97F-86332AD3E363}.Release|Win32.Build.0 = ReleaseStatic|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.ActiveCfg = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.ActiveCfg = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = ReleaseLib|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/openmpt123/Makefile 2013-10-11 10:38:42 UTC (rev 2860)
@@ -65,7 +65,7 @@
# build setup
-CPPFLAGS += -I../common -I.. -I../include/modplug/include
+CPPFLAGS += -I../common -I.. -I../include/modplug/include -I../include
CXXFLAGS += -fvisibility=hidden
CFLAGS += -fvisibility=hidden
LDFLAGS +=
@@ -198,6 +198,9 @@
../libopenmpt/libopenmpt_impl.cpp \
../libopenmpt/libopenmpt_interactive.cpp \
../libopenmpt/libopenmpt_version.cpp \
+ifeq ($(NO_ZLIB),1)
+LIBOPENMPT_CXX_SOURCES += ../miniz/miniz.c
+endif
LIBOPENMPT_OBJECTS = $(LIBOPENMPT_CXX_SOURCES:.cpp=.o)
LIBOPENMPT_DEPENDS = $(LIBOPENMPT_OBJECTS:.o=.d)
Modified: trunk/OpenMPT/openmpt123/openmpt123.sln
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.sln 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/openmpt123/openmpt123.sln 2013-10-11 10:38:42 UTC (rev 2860)
@@ -7,8 +7,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flac", "..\include\flac\flac.vcxproj", "{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\include\zlib\zlib.vcxproj", "{1654FB18-FDE6-406F-9D84-BA12BFBD67B2}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "..\include\portaudio\portaudio.vcxproj", "{189B867F-FF4B-45A1-B741-A97492EE69AF}"
EndProject
Global
@@ -43,14 +41,6 @@
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|Win32.Build.0 = ReleaseLib|Win32
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.ActiveCfg = ReleaseLib|x64
{E599F5AA-F9A3-46CC-8DB0-C8DEFCEB90C5}.Release|x64.Build.0 = ReleaseLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.ActiveCfg = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|Win32.Build.0 = DebugLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.ActiveCfg = DebugLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Debug|x64.Build.0 = DebugLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.ActiveCfg = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|Win32.Build.0 = ReleaseLib|Win32
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.ActiveCfg = ReleaseLib|x64
- {1654FB18-FDE6-406F-9D84-BA12BFBD67B2}.Release|x64.Build.0 = ReleaseLib|x64
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.ActiveCfg = DebugLib|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|Win32.Build.0 = DebugLib|Win32
{189B867F-FF4B-45A1-B741-A97492EE69AF}.Debug|x64.ActiveCfg = DebugLib|x64
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2013-10-11 10:36:46 UTC (rev 2859)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2013-10-11 10:38:42 UTC (rev 2860)
@@ -15,7 +15,7 @@
#include "Loaders.h"
#include "ChunkReader.h"
-#ifndef NO_ZLIB
+#if !defined(NO_ZLIB)
#if MPT_COMPILER_MSVC
#include <zlib/zlib.h>
@@ -23,9 +23,14 @@
#include <zlib.h>
#endif
-#endif // ZLIB
+#elif !defined(NO_MINIZ)
+#define MINIZ_HEADER_FILE_ONLY
+#include "miniz/miniz.c"
+#endif
+
+
// First off, a nice vibrato translation LUT.
static const uint8 j2bAutoVibratoTrans[] =
{
@@ -979,7 +984,7 @@
//-------------------------------------------------------------------
{
-#ifdef NO_ZLIB
+#if defined(NO_ZLIB) && defined(NO_MINIZ)
MPT_UNREFERENCED_PARAMETER(file);
MPT_UNREFERENCED_PARAMETER(loadFlags);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
