Merge branch 'sezero-misc-fixes'

Author: Konstanty

CMakeLists.txt

@@ -1,77 +1,81 @@
-cmake_minimum_required(VERSION 2.8.0)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(libmodplug)
+
+set(VERSION "0.8.9.1")
+
+option(BUILD_SHARED_LIBS "Build Shared Library (DLL)" OFF)
+
 add_definitions(-DMODPLUG_BUILD)
 
 include (CheckFunctionExists)
 include (CheckIncludeFile)
+include (CheckCCompilerFlag)
+include (CheckCSourceCompiles)
+include (TestBigEndian)
+
+TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+if(WORDS_BIGENDIAN)
+  add_definitions(-DWORDS_BIGENDIAN=1)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  add_definitions(-Wall)
+  # check symbol visibility attributes
+  set(OLD_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+  if(NOT WIN32 AND NOT CYGWIN)
+    set(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS} -Werror")
+    check_c_source_compiles("int foo(void) __attribute__((visibility(\"default\")));
+                             int main(void) {return 0;}" HAVE_VISIBILITY_DEFAULT)
+    if(HAVE_VISIBILITY_DEFAULT)
+      check_c_compiler_flag(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
+    endif()
+  endif()
+  set(CMAKE_REQUIRED_FLAGS "-Wl,--no-undefined")
+  check_c_compiler_flag("" HAVE_NO_UNDEFINED)
+  set(CMAKE_REQUIRED_FLAGS "${OLD_REQUIRED_FLAGS}")
+endif()
 
 include_directories(AFTER
   src
   src/libmodplug
   ${PROJECT_BINARY_DIR}
-  )
+)
 
-if (UNIX)
-  set (CMAKE_REQUIRED_LIBRARIES m)
+if(UNIX AND NOT APPLE)
+  find_library(MATH_LIB m)
+  if(MATH_LIB)
+    set(CMAKE_REQUIRED_LIBRARIES m)
+  endif()
 endif()
 
 if (WIN32)
   add_definitions(-D_USE_MATH_DEFINES)
   add_definitions(-DNOMINMAX)
 endif()
 
-if (WIN32 AND NOT (MINGW OR MSYS))
-  set(MSINTTYPES_PATH "$ENV{MSINTTYPES_PATH}" CACHE PATH "search path for inttypes.h and stdint.h")
-
-  find_path(STDINT_INCLUDE_DIR
-    stdint.h
-    PATHS
-    ${MSINTTYPES_PATH})
-
-  if (STDINT_INCLUDE_DIR)
-    add_definitions(-DHAVE_STDINT_H)
-    include_directories(AFTER "${STDINT_INCLUDE_DIR}")
-  endif()
-
-  find_path(INTTYPES_INCLUDE_DIR
-    inttypes.h
-    PATHS
-    ${MSINTTYPES_PATH})
-
-  if (INTTYPES_INCLUDE_DIR)
-    add_definitions(-DHAVE_INTTYPES_H)
-    include_directories(AFTER "${INTTYPES_INCLUDE_DIR}")
-  endif()
-
-  if (NOT STDINT_INCLUDE_DIR OR NOT INTTYPES_INCLUDE_DIR)
-    message(WARNING
-      "Compilation may fail if inttypes.h is not natively supported by the compiler."
-      "You can get inttypes.h from http://code.google.com/p/msinttypes/")
-  endif()
-else()
-  check_include_file("stdint.h" HAVE_STDINT)
-  if (HAVE_STDINT)
-    add_definitions(-DHAVE_STDINT_H)
-  endif()
+check_include_file("stdint.h" HAVE_STDINT)
+if (HAVE_STDINT)
+  add_definitions(-DHAVE_STDINT_H)
 endif()
 
 check_function_exists("sinf" HAVE_SINF)
-
-# Allow the developer to select if Dynamic or Static libraries are built
-option(BUILD_SHARED_LIBS "Build Shared Library (DLL)" OFF)
-
-# Set the LIB_TYPE variable to STATIC
-set(LIB_TYPE STATIC)
+if(HAVE_SINF)
+  add_definitions(-DHAVE_SINF)
+endif()
 
 if (BUILD_SHARED_LIBS)
-  # User wants to build Dynamic Libraries,
-  # so change the LIB_TYPE variable to CMake keyword 'SHARED'
   set (LIB_TYPE SHARED)
-  add_definitions(-DDLL_EXPORT)
-else (BUILD_SHARED_LIBS)
+  if (WIN32 OR CYGWIN)
+    add_definitions(-DDLL_EXPORT)
+  elseif (HAVE_VISIBILITY_HIDDEN)
+    add_definitions(-fvisibility=hidden)
+    add_definitions("-DSYM_VISIBILITY")
+  endif()
+else ()
+  set(LIB_TYPE STATIC)
   add_definitions(-DMODPLUG_STATIC)
-endif (BUILD_SHARED_LIBS)
+endif()
 
 add_library(modplug ${LIB_TYPE}
   src/libmodplug/it_defs.h
@@ -115,7 +119,24 @@ add_library(modplug ${LIB_TYPE}
   src/sndfile.cpp
   src/sndmix.cpp
   src/tables.h
-  )
+)
+
+if (BUILD_SHARED_LIBS)
+  if(APPLE)
+    target_link_libraries(modplug -Wl,-undefined,error)
+    target_link_libraries(modplug -Wl,-compatibility_version,2.0.0)
+    target_link_libraries(modplug -Wl,-current_version,2.0.0)
+  else()
+    if(HAVE_NO_UNDEFINED)
+      target_link_libraries(modplug -Wl,--no-undefined)
+    endif()
+    set_target_properties(modplug PROPERTIES
+                                  VERSION 1.0.0 SOVERSION 1)
+  endif()
+  if(MATH_LIB)
+    target_link_libraries(modplug m)
+  endif()
+endif()
 
 # install the library:
 include (GNUInstallDirs)
@@ -128,17 +149,13 @@ install(TARGETS modplug
 # install the headers:
 install(FILES
   src/modplug.h
-  ${HEADERS_CXX}
+  src/libmodplug/it_defs.h
+  src/libmodplug/sndfile.h
+  src/libmodplug/stdafx.h
 
   DESTINATION
   ${CMAKE_INSTALL_INCLUDEDIR}/libmodplug
-  )
-
-set(VERSION "0.8.9.1")
-
-if(HAVE_SINF)
-  add_definitions(-DHAVE_SINF)
-endif(HAVE_SINF)
+)
 
 if (NOT WIN32)
   set(prefix ${CMAKE_INSTALL_PREFIX})
@@ -149,6 +166,6 @@ if (NOT WIN32)
 
   # install pkg-config file:
   install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc"
-     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   )
 endif (NOT WIN32)

Makefile.am

@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src
 
-EXTRA_DIST =	 \
+EXTRA_DIST = CMakeLists.txt \
 	AUTHORS COPYING ChangeLog \
 	INSTALL README TODO
 

README

@@ -188,21 +188,6 @@ Solution:
  turn down your volume again when you play an MP3.
 
 
-Problem:
- You have a mod which is rendered incorrectly by ModPlug-XMMS.
-
-Possible cause:
- This could be our fault. :)
-
-Solution:
- First, test the mod using the Windows version of ModPlug, if you can.
- If it sounds wrong there, then send the mod and a bug report to
- Olivier Lapicque <[email protected]>.  If the mod plays correctly in
- Windows, however, then the bug is my fault.  In that case, e-mail
- me (Konstanty) <[email protected]>. (previously Kenton Varda at
- <[email protected]>).
-
-
 Problem:
  I have a problem which is not listed here, or an idea for a cool
  feature.

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.71])
+AC_PREREQ([2.63])
 
 AC_INIT([libmodplug],[0.8.9.1])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -17,48 +17,42 @@ AC_PROG_CXX
 AC_LANG([C++])
 AC_C_BIGENDIAN
 
-#AC_LIBTOOL_WIN32_DLL
-#AC_PROG_LIBTOOL
-LT_INIT([win32-dll])
-
-m4_warn([obsolete],
-[The preprocessor macro `STDC_HEADERS' is obsolete.
-  Except in unusual embedded environments, you can safely include all
-  ISO C90 headers unconditionally.])dnl
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
-AC_CHECK_INCLUDES_DEFAULT
-AC_PROG_EGREP
+LT_INIT([win32-dll disable-static])
 
 AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
-AC_CHECK_FUNCS(sinf)
 
 CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -fno-common -D_REENTRANT"
 
 AC_CANONICAL_HOST
-case "$host" in
-	*mingw* | *cygwin*)
-		LT_LDFLAGS="-no-undefined"
-		;;
-	*)
-		LT_LDFLAGS=""
-		;;
-esac
-AC_SUBST(LT_LDFLAGS)
 
-# require 10.5+ for osx/x86_64 builds
-case "$host" in
-	x86_64-*-darwin*)
-		CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.5"
-		LDFLAGS="$LDFLAGS -mmacosx-version-min=10.5" ;;
+LIBM=
+case "${host_os}" in
+dnl Djgpp has all c89 math funcs in libc.a
+*djgpp)
+  ;;
+dnl These systems don't have libm or don't need it (list based on libtool)
+darwin*|haiku*|beos*|cegcc*|pw32*)
+  ;;
+dnl MinGW and Cygwin don't need libm, either
+mingw*|cygwin*)
+  ;;
+dnl All others:
+*) AC_CHECK_LIB(m, pow, LIBM="-lm")
+  if test x$LIBM != x; then
+    LIBS="${LIBS} ${LIBM}"
+  fi
+  ;;
 esac
+AC_CHECK_FUNCS(sinf)
 
 # symbol visibility
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Werror"
 AC_CACHE_CHECK([if compiler supports visibility attributes],[libmodplug_cv_gcc_visibility],
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void foo(void);
-__attribute__((visibility("default"))) void foo(void) {}]], [[]])],[libmodplug_cv_gcc_visibility=yes],[libmodplug_cv_gcc_visibility=no])
+__attribute__((visibility("default"))) void foo(void) {}]], [])],
+		[libmodplug_cv_gcc_visibility=yes],
+		[libmodplug_cv_gcc_visibility=no])
 	)
 # we want symbol -fvisibility for elf targets, however it works
 # with darwin/macho too.  other than that, windows, dos and os2

src/Makefile.am

@@ -5,8 +5,7 @@ AM_CXXFLAGS = -DMODPLUG_BUILD=1
 AM_CPPFLAGS = -I$(top_srcdir)/src/libmodplug
 
 lib_LTLIBRARIES = libmodplug.la
-libmodplug_la_LDFLAGS = -version-info $(MODPLUG_LIBRARY_VERSION) $(LT_LDFLAGS)
-libmodplug_la_LIBADD = -lm
+libmodplug_la_LDFLAGS = -no-undefined -version-info $(MODPLUG_LIBRARY_VERSION)
 libmodplug_la_SOURCES = tables.h         \
                         sndmix.cpp         \
                         sndfile.cpp        \

src/fastmix.cpp

@@ -287,16 +287,22 @@ CzWINDOWEDFIR sfir;
 // ----------------------------------------------------------------------------
 // MIXING MACROS
 // ----------------------------------------------------------------------------
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
+#define REGISTER
+#else
+#define REGISTER register
+#endif
+
 #define SNDMIX_BEGINSAMPLELOOP8\
-	register MODCHANNEL * const pChn = pChannel;\
+	REGISTER MODCHANNEL * const pChn = pChannel;\
 	nPos = pChn->nPosLo;\
 	const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\
 	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
 	int *pvol = pbuffer;\
 	do {
 
 #define SNDMIX_BEGINSAMPLELOOP16\
-	register MODCHANNEL * const pChn = pChannel;\
+	REGISTER MODCHANNEL * const pChn = pChannel;\
 	nPos = pChn->nPosLo;\
 	const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\
 	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
@@ -1485,13 +1491,13 @@ UINT CSoundFile::CreateStereoMix(int count)
 	{
 		const LPMIXINTERFACE *pMixFuncTable;
 		MODCHANNEL * const pChannel = &Chn[ChnMix[nChn]];
-		UINT nFlags, nMasterCh;
+		UINT nFlags;//, nMasterCh
 		LONG nSmpCount;
 		int nsamples;
 		int *pbuffer;
 
 		if (!pChannel->pCurrentSample) continue;
-		nMasterCh = (ChnMix[nChn] < m_nChannels) ? ChnMix[nChn]+1 : pChannel->nMasterChn;
+		//nMasterCh = (ChnMix[nChn] < m_nChannels) ? ChnMix[nChn]+1 : pChannel->nMasterChn;
 		pOfsR = &gnDryROfsVol;
 		pOfsL = &gnDryLOfsVol;
 		nFlags = 0;
@@ -1606,7 +1612,7 @@ UINT CSoundFile::CreateStereoMix(int count)
 }
 
 
-#ifdef MSC_VER
+#ifdef _MSC_VER
 #pragma warning (disable:4100)
 #endif
 
@@ -1700,7 +1706,6 @@ DWORD MPPASMCALL X86_Convert32To8(LPVOID lp8, int *pBuffer, DWORD lSampleCount,
 }
 #endif //MSC_VER, else
 
-
 #if defined(_MSC_VER) && defined(_M_IX86)
 // Clip and convert to 16 bit
 __declspec(naked) DWORD MPPASMCALL X86_Convert32To16(LPVOID lp16, int *pBuffer, DWORD lSampleCount, LPLONG lpMin, LPLONG lpMax)