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

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

Revision: 4551
          http://sourceforge.net/p/modplug/code/4551
Author:   manxorist
Date:     2014-11-05 10:55:56 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
[Imp] build: Reduce 'make CONFIG=generic' dependency on GCC-specific command line options.

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

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2014-11-05 00:07:46 UTC (rev 4550)
+++ trunk/OpenMPT/Makefile	2014-11-05 10:55:56 UTC (rev 4551)
@@ -220,6 +220,30 @@
 INSTALL_MAKE_DIR += -m 0755
 
 CPPFLAGS += -Icommon -I. -Iinclude/modplug/include -Iinclude
+
+ifeq ($(MPT_COMPILER_GENERIC),1)
+
+CXXFLAGS += 
+CFLAGS   += 
+LDFLAGS  += 
+LDLIBS   += 
+ARFLAGS  += 
+
+ifeq ($(DEBUG),1)
+CXXFLAGS += -g
+CFLAGS   += -g
+else
+ifeq ($(OPTIMIZE),1)
+CXXFLAGS += -O
+CFLAGS   += -O
+endif
+endif
+
+CXXFLAGS += -W
+CFLAGS   += -W
+
+else
+
 CXXFLAGS += -fvisibility=hidden
 CFLAGS   += -fvisibility=hidden
 LDFLAGS  += 
@@ -239,6 +263,8 @@
 CXXFLAGS += -Wall -Wextra -Wcast-align $(CXXFLAGS_WARNINGS)
 CFLAGS   += -Wall -Wextra -Wcast-align $(CFLAGS_WARNINGS)
 
+endif
+
 ifeq ($(DYNLINK),1)
 LDFLAGS_RPATH += -Wl,-rpath,./bin
 LDFLAGS_LIBOPENMPT += -Lbin

Modified: trunk/OpenMPT/build/make/Makefile.config.clang
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.clang	2014-11-05 00:07:46 UTC (rev 4550)
+++ trunk/OpenMPT/build/make/Makefile.config.clang	2014-11-05 10:55:56 UTC (rev 4551)
@@ -4,7 +4,6 @@
 LD  = clang++
 AR  = ar 
 
-#CPPFLAGS += -DMPT_COMPILER_GENERIC
 CPPFLAGS +=
 CXXFLAGS += -std=c++0x -fPIC 
 CFLAGS   += -std=c99   -fPIC

Modified: trunk/OpenMPT/build/make/Makefile.config.generic
===================================================================
--- trunk/OpenMPT/build/make/Makefile.config.generic	2014-11-05 00:07:46 UTC (rev 4550)
+++ trunk/OpenMPT/build/make/Makefile.config.generic	2014-11-05 10:55:56 UTC (rev 4551)
@@ -5,11 +5,15 @@
 AR  = ar
 
 #CPPFLAGS += -DMPT_COMPILER_GENERIC
-CXXFLAGS += -std=c++11 -fPIC 
-CFLAGS   += -std=c99   -fPIC 
+CXXFLAGS += -std=c++11 
+CFLAGS   += -std=c99   
 LDFLAGS  += 
-LDLIBS   += -lm
+LDLIBS   += 
 ARFLAGS  := rcs
 
+MPT_COMPILER_GENERIC=1
+SHARED_LIB=0
+DYNLINK=0
+
 EXESUFFIX=
 

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