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

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

Revision: 3440
          http://sourceforge.net/p/modplug/code/3440
Author:   manxorist
Date:     2013-12-11 14:18:08 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
[Imp] libopenmpt build: Auto-detect if running on windows.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/README

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2013-12-11 13:55:29 UTC (rev 3439)
+++ trunk/OpenMPT/Makefile	2013-12-11 14:18:08 UTC (rev 3440)
@@ -72,19 +72,27 @@
 
 # host setup
 
-ifeq ($(HOST),windows)
+ifeq ($(OS),Windows_NT)
 
+HOST=windows
+
 RM = del /q /f
+RMTREE = del /q /f /s
 INSTALL = echo install
 INSTALL_MAKE_DIR = echo install
 INSTALL_DIR = echo install
+FIXPATH = $(subst /,\,$1)
 
 else
 
+HOST=unix
+
 RM = rm -f
+RMTREE = rm -rf
 INSTALL = install
 INSTALL_MAKE_DIR = install -d
 INSTALL_DIR = cp -r -v
+FIXPATH = $1
 
 endif
 
@@ -128,8 +136,7 @@
 #CXXFLAGS += -mtune=generic
 #CFLAGS   += -mtune=generic
 
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 
 ifeq ($(shell help2man --version > /dev/null 2>&1 && echo yes ),yes)
 MPT_WITH_HELP2MAN := 1
@@ -361,8 +368,7 @@
 ifeq ($(TEST),1)
 OUTPUTS += bin/libopenmpt_test$(EXESUFFIX)
 else
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 OUTPUTS += bin/libopenmpt.pc
 endif
 ifeq ($(OPENMPT123),1)
@@ -590,8 +596,7 @@
 bin/openmpt123$(EXESUFFIX): $(OPENMPT123_OBJECTS) $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_OPENMPT123) $(OPENMPT123_OBJECTS) $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_OPENMPT123) -o $@
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 	$(SILENT)mv $@ $@.norpath
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_OPENMPT123) $(OPENMPT123_OBJECTS) $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_OPENMPT123) -o $@
@@ -612,8 +617,7 @@
 bin/libopenmpt_example_c$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 	$(SILENT)mv $@ $@.norpath
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_c.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
@@ -621,8 +625,7 @@
 bin/libopenmpt_example_c_mem$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 	$(SILENT)mv $@ $@.norpath
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_c_mem.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
@@ -630,20 +633,14 @@
 bin/libopenmpt_example_cxx$(EXESUFFIX): libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
-ifeq ($(HOST),windows)
-else
+ifeq ($(HOST),unix)
 	$(SILENT)mv $@ $@.norpath
 	$(INFO) [LD ] $@
 	$(SILENT)$(LINK.cc) $(LDFLAGS_RPATH) $(LDFLAGS_LIBOPENMPT) $(LDFLAGS_EXAMPLES) libopenmpt/examples/libopenmpt_example_cxx.o $(OBJECTS_LIBOPENMPT) $(LOADLIBES) $(LDLIBS) $(LDLIBS_LIBOPENMPT) $(LDLIBS_EXAMPLES) -o $@
 endif
 
-ifeq ($(HOST),windows)
+.PHONY: clean
 clean:
 	$(INFO) clean ...
-	$(SILENT)$(RM) $(subst /,\,$(OUTPUTS) $(ALL_OBJECTS) $(ALL_DEPENDS) )
-else
-clean:
-	$(INFO) clean ...
-	$(SILENT)$(RM) $(OUTPUTS) $(ALL_OBJECTS) $(ALL_DEPENDS) $(MISC_OUTPUTS)
-	$(SILENT)$(RM) -rf $(MISC_OUTPUTDIRS)
-endif
+	$(SILENT)$(RM) $(call FIXPATH,$(OUTPUTS) $(ALL_OBJECTS) $(ALL_DEPENDS) $(MISC_OUTPUTS))
+	$(SILENT)$(RMTREE) $(call FIXPATH,$(MISC_OUTPUTDIRS))

Modified: trunk/OpenMPT/README
===================================================================
--- trunk/OpenMPT/README	2013-12-11 13:55:29 UTC (rev 3439)
+++ trunk/OpenMPT/README	2013-12-11 14:18:08 UTC (rev 3440)
@@ -46,19 +46,14 @@
       You can disable xmp-openmpt in the solution configuration.
   - The openmpt123 solution is in openmpt123/openmpt123.sln.
 - Makefile
-  The makefile supports different build environments and targets via HOST= and
-  CONFIG= parameters directly to the make invocation.
+  The makefile supports different build environments and targets via the
+  CONFIG= parameter directly to the make invocation.
   Use 'make CONFIG=$newconfig clean' when switching between different configs
   because the makefile cleans only intermediates and target that are active
   for the current config and no configuration state is kept around across
   invocations.
-  - mingw-w64 (on windows):
+  - mingw-w64:
     The required version should be at least 4.4. Only 4.6 and up are tested.
-    - mingw32-make HOST=windows CONFIG=mingw64-win32
-    - mingw32-make HOST=windows CONFIG=mingw64-win64
-    depending on whether you want win32 or win64 builds.
-  - mingw-w64 (on unix):
-    The required version should be at least 4.4. Only 4.6 and up are tested.
     - make CONFIG=mingw64-win32
     - make CONFIG=mingw64-win64
     depending on whether you want win32 or win64 builds.

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