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

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

Revision: 4144
          http://sourceforge.net/p/modplug/code/4144
Author:   manxorist
Date:     2014-06-20 09:38:10 +0000 (Fri, 20 Jun 2014)
Log Message:
-----------
[Mod] build: Only assume GCC on linux by default, fall back to general cc/c++ on other systems. GCC can still be used easily with CONFIG=gcc.

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

Added Paths:
-----------
    trunk/OpenMPT/build/make/Makefile.config.generic

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2014-06-20 09:24:58 UTC (rev 4143)
+++ trunk/OpenMPT/Makefile	2014-06-20 09:38:10 UTC (rev 4144)
@@ -189,6 +189,9 @@
 ifeq ($(UNAME_S),Darwin)
 HOST_FLAVOUR=MACOSX
 endif
+ifeq ($(UNAME_S),Linux)
+HOST_FLAVOUR=LINUX
+endif
 
 endif
 

Modified: trunk/OpenMPT/build/make/Makefile.config.defaults
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.defaults	2014-06-20 09:24:58 UTC (rev 4143)
+++ trunk/OpenMPT/build/make/Makefile.config.defaults	2014-06-20 09:38:10 UTC (rev 4144)
@@ -1,31 +1,28 @@
 
-CC  = gcc 
-CXX = g++
-LD  = g++
-AR  = ar
+ifeq ($(HOST),unix)
 
-#CPPFLAGS += -DMPT_COMPILER_GENERIC
-CPPFLAGS += 
-CXXFLAGS += -std=c++0x -fPIC 
-CFLAGS   += -std=c99   -fPIC 
-LDFLAGS  += 
-LDLIBS   += -lm
-ARFLAGS  := rcs
-
-EXESUFFIX=
-
-
-ifeq ($(HOST),unix)
 ifeq ($(HOST_FLAVOUR),MACOSX)
 
+include build/make/Makefile.config.clang
 # Mac OS X overrides
-
 DYNLINK=0
-
 # when using iconv
 #CPPFLAGS += -DMPT_WITH_ICONV
 #LDLIBS += -liconv
 
+else ifeq ($(HOST_FLAVOUR),LINUX)
+
+include build/make/Makefile.config.gcc
+
+else
+
+include build/make/Makefile.config.generic
+
 endif
+
+else
+
+include build/make/Makefile.config.generic
+
 endif
 

Modified: trunk/OpenMPT/build/make/Makefile.config.gcc
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.gcc	2014-06-20 09:24:58 UTC (rev 4143)
+++ trunk/OpenMPT/build/make/Makefile.config.gcc	2014-06-20 09:38:10 UTC (rev 4144)
@@ -1,2 +1,15 @@
 
-include Makefile.config.defaults
+CC  = gcc 
+CXX = g++
+LD  = g++
+AR  = ar
+
+CPPFLAGS += 
+CXXFLAGS += -std=c++0x -fPIC 
+CFLAGS   += -std=c99   -fPIC 
+LDFLAGS  += 
+LDLIBS   += -lm
+ARFLAGS  := rcs
+
+EXESUFFIX=
+

Added: trunk/OpenMPT/build/make/Makefile.config.generic
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.generic	                        (rev 0)
+++ trunk/OpenMPT/build/make/Makefile.config.generic	2014-06-20 09:38:10 UTC (rev 4144)
@@ -0,0 +1,15 @@
+
+CC  = cc 
+CXX = c++
+LD  = c++
+AR  = ar
+
+#CPPFLAGS += -DMPT_COMPILER_GENERIC
+CXXFLAGS += -std=c++11 -fPIC 
+CFLAGS   += -std=c99   -fPIC 
+LDFLAGS  += 
+LDLIBS   += -lm
+ARFLAGS  := rcs
+
+EXESUFFIX=
+

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