Make the ranlib and ar executables configurable. Support for setting the cross-compil...

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

diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile
index edc07249dbfdbb64abd2a4082846d8451ae16d0e..923ce4241f0a895da9b32bccc7aef5c13888fb01 100644 (file)
--- a/make/mingw32/Makefile
+++ b/make/mingw32/Makefile
@@ -21,10 +21,13 @@ EBML_DLL = yes
 ifeq (yes,$(DEBUG))\r
 DEBUGFLAGS=-g -DDEBUG\r
 endif\r
-CXX  = g++.exe\r
-LD = g++.exe\r
-WINDRES = windres.exe\r
-RES  = \r
+CROSS   =\r
+CXX     = $(CROSS)g++\r
+CC      = $(CROSS)gcc\r
+WINDRES = $(CROSS)windres\r
+RANLIB  = $(CROSS)ranlib\r
+AR      = $(CROSS)ar\r
+RES  =\r
 SRC  = $(wildcard ../../src/*.cpp)\r
 OBJ  = $(patsubst %.cpp,%.o,$(SRC))\r
 ifeq (yes,$(SHARED))\r
@@ -39,7 +42,7 @@ CXXFLAGS += -DEBML_DLL
 endif\r
 INCS = -I../.. -I$(EBML_DIR)\r
 LDFLAGS = -L. -L$(EBML_DIR)/make/mingw32\r
-CXXFLAGS += $(DEBUGFLAGS) $(INCS) \r
+CXXFLAGS += $(DEBUGFLAGS) $(INCS)\r
 TESTS = test6 test8 test9\r
 \r
 .PHONY: all all-before all-after clean clean-custom\r
@@ -61,8 +64,8 @@ distclean dist-clean: clean
        rm -f .depend\r
 \r
 libmatroska.a: $(OBJ)\r
-       ar r $@ $(OBJ)\r
-       ranlib $@\r
+       $(AR) r $@ $(OBJ)\r
+       $(RANLIB) $@\r
 \r
 libmatroska.dll: $(OBJ)\r
        $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) \\r