Merge branch 'master' into translation

[lilypond.git] / stepmake / stepmake / compile-vars.make

diff --git a/stepmake/stepmake/compile-vars.make b/stepmake/stepmake/compile-vars.make
index 6c493db8af961967f834d4059f84e69a72f74218..7b04699f090537cfae46821c33675ac17df0b340 100644 (file)
--- a/stepmake/stepmake/compile-vars.make
+++ b/stepmake/stepmake/compile-vars.make
@@ -1,9 +1,15 @@
 ARFLAGS = ru
 
-LDFLAGS = $(ILDFLAGS) $(EXTRA_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(USER_LDFLAGS)
+ALL_LDFLAGS = $(LDFLAGS) $(CONFIG_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(CONFIG_LDFLAGS)
 
+ifeq ($(MINGW_BUILD),)
+ifeq ($(CYGWIN_BUILD),)
 PIC_FLAGS = -fpic -fPIC
-SHARED_FLAGS = -shared -flat_namespace -undefined suppress
+endif
+SHARED_FLAGS = -shared
+else
+SHARED_FLAGS = -mdll
+endif
 
 o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
 DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out) $(outdir)/$(notdir $@)"