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

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

Revision: 4471
          http://sourceforge.net/p/modplug/code/4471
Author:   manxorist
Date:     2014-10-23 09:41:22 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
[Ref] test: Do not build the libopenmpt public interface into the libopenmpt test suite when building with Makefile.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2014-10-23 09:12:11 UTC (rev 4470)
+++ trunk/OpenMPT/Makefile	2014-10-23 09:41:22 UTC (rev 4471)
@@ -398,7 +398,6 @@
 
 LIBOPENMPT_CXX_SOURCES += \
  $(SOUNDLIB_CXX_SOURCES) \
- $(wildcard test/*.cpp) \
  libopenmpt/libopenmpt_c.cpp \
  libopenmpt/libopenmpt_cxx.cpp \
  libopenmpt/libopenmpt_impl.cpp \
@@ -442,9 +441,13 @@
 
 LIBOPENMPTTEST_CXX_SOURCES += \
  libopenmpt/libopenmpt_test.cpp \
+ $(SOUNDLIB_CXX_SOURCES) \
+ $(wildcard test/*.cpp) \
  
-LIBOPENMPTTEST_CXX_SOURCES += $(LIBOPENMPT_CXX_SOURCES)
-LIBOPENMPTTEST_C_SOURCES += $(LIBOPENMPT_C_SOURCES)
+ifeq ($(NO_ZLIB),1)
+LIBOPENMPTTEST_C_SOURCES += include/miniz/miniz.c
+endif
+
 LIBOPENMPTTEST_OBJECTS = $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test.o) $(LIBOPENMPTTEST_C_SOURCES:.c=.test.o)
 LIBOPENMPTTEST_DEPENDS = $(LIBOPENMPTTEST_CXX_SOURCES:.cpp=.test.d) $(LIBOPENMPTTEST_C_SOURCES:.c=.test.d)
 ALL_OBJECTS += $(LIBOPENMPTTEST_OBJECTS)

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp	2014-10-23 09:12:11 UTC (rev 4470)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp	2014-10-23 09:41:22 UTC (rev 4471)
@@ -10,11 +10,10 @@
 #include "BuildSettings.h"
 
 #include "libopenmpt_internal.h"
-#include "libopenmpt.hpp"
-#include "libopenmpt.h"
 
 #include "test/test.h"
 
+#include <iostream>
 #include <locale>
 
 #include <clocale>

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