X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fshared-library-vars.make;h=8b9ccbcd9e9dccfb3abbe79e74060a2f9ddfbe5d;hb=07125596018d32e3235e80627915cfac77323272;hp=a8ea9a9935da13c0f91c35edf84501d0ee8ed5cf;hpb=46a3972bc05b0fbe77e1dcda58f5e2a83e71a79a;p=lilypond.git

diff --git a/stepmake/stepmake/shared-library-vars.make b/stepmake/stepmake/shared-library-vars.make
index a8ea9a9935..8b9ccbcd9e 100644
--- a/stepmake/stepmake/shared-library-vars.make
+++ b/stepmake/stepmake/shared-library-vars.make
@@ -1,15 +1,26 @@
 
+ifeq ($(CYGWIN_BUILD)$(MINGW_BUILD),)
+  SHARED_LIB_PREFIX = lib
+  SHARED_LIB_SUFFIX = .so
+  SHARED_LIB_VERSION = $(VERSION)
+  SHARED_LIB_VERSION_SUFFIX =
+else
 ifneq ($(CYGWIN_BUILD),)
   SHARED_LIB_PREFIX = cyg
-  SHARED_LIB_SUFFIX = 
+  SHARED_LIB_SUFFIX =
   SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
   SHARED_LIB_VERSION_SUFFIX = .dll
-  ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
-else
+#  ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
+  ALL_LDFLAGS += -Wl,--enable-auto-image-base -Wl,--out-implib,lib$(NAME).a
+endif
+ifneq ($(MINGW_BUILD),)
   SHARED_LIB_PREFIX = lib
-  SHARED_LIB_SUFFIX = .so
-  SHARED_LIB_VERSION = $(VERSION)
-  SHARED_LIB_VERSION_SUFFIX =
+  SHARED_LIB_SUFFIX =
+  SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
+  SHARED_LIB_VERSION_SUFFIX = .dll
+##  ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
+  ALL_LDFLAGS += -Wl,--out-implib,lib$(NAME).a
+endif
 endif
 
 INSTALL_SHARED_LIBRARY = $(SHARED_LIB_PREFIX)$(NAME)$(SHARED_LIB_SUFFIX)$(SHARED_LIB_VERSION)$(SHARED_LIB_VERSION_SUFFIX)
@@ -20,4 +31,3 @@ lo-dep-out = $(outdir)/$(subst .lo,.dep,$(notdir $@))#
 DO_LO_DEP = rm -f $(lo-dep-out); DEPENDENCIES_OUTPUT="$(lo-dep-out) $(outdir)/$(notdir $@)"
 
 LO_FILES += $(addprefix $(outdir)/, $(Y_FILES:.y=.lo) $(C_FILES:.c=.lo) $(L_FILES:.l=.lo))
-