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

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

Revision: 3444
          http://sourceforge.net/p/modplug/code/3444
Author:   manxorist
Date:     2013-12-11 17:24:35 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
[Imp] libopenmpt build: Automate Mac OS X detection.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/build/make/Makefile.config.defaults
    trunk/OpenMPT/build/make/Makefile.config.macosx

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2013-12-11 16:46:09 UTC (rev 3443)
+++ trunk/OpenMPT/Makefile	2013-12-11 17:24:35 UTC (rev 3444)
@@ -24,6 +24,8 @@
 endif
 
 
+# general settings
+
 DYNLINK=1
 SHARED_LIB=1
 STATIC_LIB=1
@@ -57,24 +59,12 @@
 #endif
 
 
-# compiler setup
-
-ifeq ($(CONFIG)x,x)
-
-include build/make/Makefile.config.defaults
-
-else
-
-include build/make/Makefile.config.$(CONFIG)
-
-endif
-
-
 # host setup
 
 ifeq ($(OS),Windows_NT)
 
 HOST=windows
+HOST_FLAVOUR=
 
 RM = del /q /f
 RMTREE = del /q /f /s
@@ -86,6 +76,7 @@
 else
 
 HOST=unix
+HOST_FLAVOUR=
 
 RM = rm -f
 RMTREE = rm -rf
@@ -94,10 +85,27 @@
 INSTALL_DIR = cp -r -v
 FIXPATH = $1
 
+UNAME_S:=$(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+HOST_FLAVOUR=MACOSX
 endif
 
+endif
 
 
+# compiler setup
+
+ifeq ($(CONFIG)x,x)
+
+include build/make/Makefile.config.defaults
+
+else
+
+include build/make/Makefile.config.$(CONFIG)
+
+endif
+
+
 # build setup
 
 INSTALL_PROGRAM = $(INSTALL) -m 0755 -D

Modified: trunk/OpenMPT/build/make/Makefile.config.defaults
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.defaults	2013-12-11 16:46:09 UTC (rev 3443)
+++ trunk/OpenMPT/build/make/Makefile.config.defaults	2013-12-11 17:24:35 UTC (rev 3444)
@@ -13,3 +13,19 @@
 ARFLAGS  := rcs
 
 EXESUFFIX=
+
+
+ifeq ($(HOST),unix)
+ifeq ($(HOST_FLAVOUR),MACOSX)
+
+# Mac OS X overrides
+
+CPPFLAGS += -DMPT_CHARSET_CPP
+DYNLINK=0
+
+# when using iconv
+#CPPFLAGS += -DMPT_ICONV_NO_WCHAR
+#LDLIBS += -liconv
+
+endif
+endif

Modified: trunk/OpenMPT/build/make/Makefile.config.macosx
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.macosx	2013-12-11 16:46:09 UTC (rev 3443)
+++ trunk/OpenMPT/build/make/Makefile.config.macosx	2013-12-11 17:24:35 UTC (rev 3444)
@@ -1,9 +1,2 @@
 
 include Makefile.config.defaults
-
-#LDLIBS += -liconv
-#CPPFLAGS += -DMPT_ICONV_NO_WCHAR
-
-CPPFLAGS += -DMPT_CHARSET_CPP
-
-DYNLINK=0

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