# HG changeset patch # User Chris Cannam # Date 1407184623 -3600 # Node ID ff78d47310af75524cf4d087c1a5861d0fa01afc # Parent 0ca8e104e8b10db63ca3e7d75927fa9c10232bae Some mingw32 fixes diff -r 0ca8e104e8b1 -r ff78d47310af build/Makefile.mingw32 --- a/build/Makefile.mingw32 Mon Aug 04 17:07:39 2014 +0100 +++ b/build/Makefile.mingw32 Mon Aug 04 21:37:03 2014 +0100 @@ -70,7 +70,7 @@ # Compile flags # -CXXFLAGS = -O2 -Wall -I. -I../include +CXXFLAGS := $(CXXFLAGS) -O2 -Wall -fno-exceptions -I. -I../include # Libraries required for the plugins. # @@ -82,12 +82,16 @@ # Libraries required for the host. # -HOST_LIBS = ./libvamp-hostsdk.a -L../lib -lsndfile +HOST_LIBS = ./libvamp-hostsdk.a -L../lib -lsndfile -lvorbis -logg -lFLAC -lvorbisenc -lws2_32 # Libraries required for the RDF template generator. # RDFGEN_LIBS = ./libvamp-hostsdk.a +# General linker flags +# +LDFLAGS := $(LDFLAGS) -fno-exceptions -static-libgcc + # Flags required to tell the compiler to create a dynamically loadable object # DYNAMIC_LDFLAGS = -shared -Wl,-Bsymbolic @@ -193,13 +197,13 @@ $(HOSTDIR)/vamp-simple-host.o HOST_TARGET = \ - $(HOSTDIR)/vamp-simple-host + $(HOSTDIR)/vamp-simple-host.exe RDFGEN_OBJECTS = \ $(RDFGENDIR)/vamp-rdf-template-generator.o RDFGEN_TARGET = \ - $(RDFGENDIR)/vamp-rdf-template-generator + $(RDFGENDIR)/vamp-rdf-template-generator.exe sdk: sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC) @@ -231,13 +235,13 @@ $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS) $(HOST_TARGET): $(HOST_OBJECTS) $(HOSTSDK_STATIC) $(HOST_HEADERS) - $(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(HOST_LIBS) + $(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(LDFLAGS) $(HOST_LIBS) $(RDFGEN_TARGET): $(RDFGEN_OBJECTS) $(HOSTSDK_STATIC) - $(CXX) $(LDFLAGS) $(RDFGEN_LDFLAGS) -o $@ $(RDFGEN_OBJECTS) $(RDFGEN_LIBS) + $(CXX) $(LDFLAGS) $(RDFGEN_LDFLAGS) -o $@ $(RDFGEN_OBJECTS) $(LDFLAGS) $(RDFGEN_LIBS) test: plugins host - VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l + VAMP_PATH=$(EXAMPLEDIR) wine $(HOST_TARGET) -l clean: rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS) $(RDFGEN_OBJECTS)