Let the user use CXXFLAGS for his own flags. Fix for not finding the includes.

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

diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile
index 097a0be65561304dcdb5b5271cd52c1619a1b0e8..404a70425142604b37339f3c8bd9b9d811a3f664 100644 (file)
--- a/make/mingw32/Makefile
+++ b/make/mingw32/Makefile
@@ -32,25 +32,26 @@ SRC  = $(wildcard ../../src/*.cpp)
 OBJ  = $(patsubst %.cpp,%.o,$(SRC))\r
 ifeq (yes,$(SHARED))\r
 LIBS = libmatroska.dll\r
-CXXFLAGS = -DMATROSKA_DLL\r
+FLAGS = -DMATROSKA_DLL\r
 DLLFLAGS = -DMATROSKA_DLL_EXPORT\r
 else\r
 LIBS = libmatroska.a\r
 endif\r
 ifeq (yes,$(SHARED))\r
 ifeq (yes,$(EBML_DLL))\r
-CXXFLAGS += -DEBML_DLL\r
+FLAGS += -DEBML_DLL\r
 endif\r
 endif\r
-INCS = -I../.. -I$(EBML_DIR)\r
+CWD = $(shell pwd)\r
+INCS = -I$(CWD)/../.. -I$(EBML_DIR)\r
 LDFLAGS = -L. -L$(EBML_DIR)/make/mingw32\r
-CXXFLAGS += $(DEBUGFLAGS) $(INCS)\r
+COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(FLAGS) $(CXXFLAGS)\r
 TESTS = test6 test8 test9\r
 \r
 .PHONY: all all-before all-after clean clean-custom\r
 \r
 .cpp.o:\r
-       $(CXX) $(DLLFLAGS) $(CXXFLAGS) -c -o $@ $<\r
+       $(CXX) $(DLLFLAGS) $(COMPILEFLAGS) -c -o $@ $<\r
 \r
 all: lib\r
 \r
@@ -76,19 +77,19 @@ libmatroska.dll: $(OBJ)
 # Explicitely list these object files because for them\r
 # MATROSKA_DLL_EXPORT must NOT be defined.\r
 ../../test/mux/test6.o: ../../test/mux/test6.cpp\r
-       $(CXX) $(CXXFLAGS) -c -o $@ $<\r
+       $(CXX) $(COMPILEFLAGS) -c -o $@ $<\r
 \r
 test6: ../../test/mux/test6.o $(LIBS)\r
        $(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml\r
 \r
 ../../test/mux/test8.o: ../../test/mux/test8.cpp\r
-       $(CXX) $(CXXFLAGS) -c -o $@ $<\r
+       $(CXX) $(COMPILEFLAGS) -c -o $@ $<\r
 \r
 test8: ../../test/mux/test8.o $(LIBS)\r
        $(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml\r
 \r
 ../../test/tags/test9.o: ../../test/tags/test9.cpp\r
-       $(CXX) $(CXXFLAGS) -c -o $@ $<\r
+       $(CXX) $(COMPILEFLAGS) -c -o $@ $<\r
 \r
 test9: ../../test/tags/test9.o $(LIBS)\r
        $(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml\r
@@ -100,7 +101,7 @@ depend:
        @for i in $(SRC); do \\r
                o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \\r
                echo '  ' $$i: $$o ; \\r
-               $(CXX) $(CXXFLAGS) -MM -MT $$o $$i >> .depend ; \\r
+               $(CXX) $(COMPILEFLAGS) -MM -MT $$o $$i >> .depend ; \\r
        done\r
 \r
 #\r