From: Moritz Bunkus Date: Tue, 23 Mar 2010 15:11:02 +0000 (+0000) Subject: Do not try to build a static libmatroska with a shared libebml. X-Git-Tag: release-0.9.0~38 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dcb5271247a80cb2158c3248975ae7c638b01f6;p=libmatroska Do not try to build a static libmatroska with a shared libebml. git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@55 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile index 923ce42..097a0be 100644 --- a/make/mingw32/Makefile +++ b/make/mingw32/Makefile @@ -37,9 +37,11 @@ DLLFLAGS = -DMATROSKA_DLL_EXPORT else LIBS = libmatroska.a endif +ifeq (yes,$(SHARED)) ifeq (yes,$(EBML_DLL)) CXXFLAGS += -DEBML_DLL endif +endif INCS = -I../.. -I$(EBML_DIR) LDFLAGS = -L. -L$(EBML_DIR)/make/mingw32 CXXFLAGS += $(DEBUGFLAGS) $(INCS)