[OMPT-svn-commit] SF.net SVN: modplug:[2899] trunk/OpenMPT

[<man...@us...>]

Revision: 2899
          http://sourceforge.net/p/modplug/code/2899
Author:   manxorist
Date:     2013-10-14 11:36:27 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
[Fix] openmpt123: Fix mingw64 builds on windows hosts.

Modified Paths:
--------------
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/openmpt123/Makefile

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2013-10-14 03:11:01 UTC (rev 2898)
+++ trunk/OpenMPT/common/typedefs.h	2013-10-14 11:36:27 UTC (rev 2899)
@@ -59,6 +59,10 @@
 #define PACKED __declspec(align(1))
 #define NEEDS_PRAGMA_PACK
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
+#if MPT_COMPILER_GCC && defined(WIN32)
+// Some versions of mingw64 need this when windows-hosted. Strange.
+#define NEEDS_PRAGMA_PACK
+#endif
 #define PACKED __attribute__((packed)) __attribute__((aligned(1)))
 #else
 #define PACKED alignas(1)

Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-10-14 03:11:01 UTC (rev 2898)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-10-14 11:36:27 UTC (rev 2899)
@@ -279,10 +279,12 @@
 
 -include $(ALL_DEPENDS)
 
+ifeq ($(DYNLINK),1)
 OUTPUTS += bin/openmpt.a
 OUTPUTS += bin/libopenmpt.so
+OUTPUTS += bin/libopenmpt_modplug.so
+endif
 OUTPUTS += bin/openmpt123$(EXESUFFIX)
-OUTPUTS += bin/libopenmpt_modplug.so
 ifeq ($(NO_PORTAUDIO),1)
 else
 OUTPUTS += bin/libopenmpt_example_c$(EXESUFFIX)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.