From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 23 Mar 2010 15:58:04 +0000 (+0000)
Subject: Made changing the tool paths easier. Do not refuse to build with a mingw compiler.
X-Git-Tag: release-0.9.0~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4360dcdebff7e2555d0615b5bd3a8cc84a400318;p=libmatroska

Made changing the tool paths easier. Do not refuse to build with a mingw compiler.

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@57 a6f86f6d-0131-4f8e-9e7b-e335508773d5
---

diff --git a/make/linux/Makefile b/make/linux/Makefile
index 52be013..ff90294 100644
--- a/make/linux/Makefile
+++ b/make/linux/Makefile
@@ -20,19 +20,16 @@ libdir=$(prefix)/lib
 includedir=$(prefix)/include/matroska
 
 # Programs
-CXX=g++
-LD=$(CXX)
-AR = ar rcvu
-RANLIB = ranlib
+CROSS =
+CXX = $(CROSS)g++
+LD = $(CXX)
+AR = $(CROSS)ar
+RANLIB = $(CROSS)ranlib
 INSTALL = install
 INSTALL_OPTS = -m 644
 INSTALL_OPTS_LIB = -m 644
 INSTALL_DIR_OPTS = -m 755
 
-ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-$(error Please use the Makefile in ../mingw32)
-endif
-
 CWD=$(shell pwd)
 
 # Options
@@ -98,7 +95,7 @@ lib:
 	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
 
 $(LIBRARY): $(objects)
-	$(AR) $@ $(objects)
+	$(AR) rcvu $@ $(objects)
 	$(RANLIB) $@
 
 $(LIBRARY_SO): $(objects_so)