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

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

Revision: 2867
          http://sourceforge.net/p/modplug/code/2867
Author:   manxorist
Date:     2013-10-11 12:48:46 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
[Fix] openmpt123: Fix building with miniz on unix.

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

Property Changed:
----------------
    trunk/OpenMPT/include/miniz/

Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2013-10-11 12:36:01 UTC (rev 2866)
+++ trunk/OpenMPT/common/BuildSettings.h	2013-10-11 12:48:46 UTC (rev 2867)
@@ -156,8 +156,10 @@
 #define NO_DSOUND
 #define NO_FLAC
 #if !defined(MPT_WITH_ZLIB)
+#ifndef NO_ZLIB
 #define NO_ZLIB
 #endif
+#endif
 //#define NO_MINIZ
 #define NO_MP3_SAMPLES
 //#define NO_LIBMODPLUG

Index: trunk/OpenMPT/include/miniz
===================================================================
--- trunk/OpenMPT/include/miniz	2013-10-11 12:36:01 UTC (rev 2866)
+++ trunk/OpenMPT/include/miniz	2013-10-11 12:48:46 UTC (rev 2867)

Property changes on: trunk/OpenMPT/include/miniz
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+*.d
+*.o
Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-10-11 12:36:01 UTC (rev 2866)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-10-11 12:48:46 UTC (rev 2867)
@@ -200,10 +200,10 @@
  ../libopenmpt/libopenmpt_version.cpp \
  
 ifeq ($(NO_ZLIB),1)
-LIBOPENMPT_CXX_SOURCES += ../miniz/miniz.c
+LIBOPENMPT_C_SOURCES += ../include/miniz/miniz.c
 endif
 
-LIBOPENMPT_OBJECTS = $(LIBOPENMPT_CXX_SOURCES:.cpp=.o)
+LIBOPENMPT_OBJECTS += $(LIBOPENMPT_CXX_SOURCES:.cpp=.o) $(LIBOPENMPT_C_SOURCES:.c=.o)
 LIBOPENMPT_DEPENDS = $(LIBOPENMPT_OBJECTS:.o=.d)
 ALL_OBJECTS += $(LIBOPENMPT_OBJECTS)
 ALL_DEPENDS += $(LIBOPENMPT_DEPENDS)
@@ -227,15 +227,18 @@
 ifeq ($(DYNLINK),1)
 OPENMPT123_CXX_SOURCES += \
  $(wildcard ../openmpt123/*.cpp) \
-
+ 
 else
 OPENMPT123_CXX_SOURCES += \
  $(LIBOPENMPT_CXX_SOURCES) \
  $(wildcard ../openmpt123/*.cpp) \
-
+ 
+OPENMPT123_C_SOURCES += \
+ $(LIBOPENMPT_C_SOURCES) \
+ 
 endif
 
-OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=.o)
+OPENMPT123_OBJECTS += $(OPENMPT123_CXX_SOURCES:.cpp=.o) $(OPENMPT123_C_SOURCES:.c=.o)
 OPENMPT123_DEPENDS = $(OPENMPT123_OBJECTS:.o=.d)
 ALL_OBJECTS += $(OPENMPT123_OBJECTS)
 ALL_DEPENDS += $(OPENMPT123_DEPENDS)
@@ -249,10 +252,13 @@
 LIBOPENMPTTEST_CXX_SOURCES += \
  $(LIBOPENMPT_CXX_SOURCES) \
  ../libopenmpt/libopenmpt_test.cpp \
-
+ 
+LIBOPENMPTTEST_C_SOURCES += \
+ $(LIBOPENMPT_C_SOURCES) \
+ 
 endif
 
-LIBOPENMPTTEST_OBJECTS += $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.o)
+LIBOPENMPTTEST_OBJECTS += $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.o) $(LIBOPENMPTTEST_C_SOURCES:.c=.o)
 LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTEST_OBJECTS:.o=.d)
 ALL_OBJECTS += $(LIBOPENMPTTEST_OBJECTS)
 ALL_DEPENDS += $(LIBOPENMPTTEST_DEPENDS)

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