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