makefile.g95 now adds _cyg or _min suffix to libraries/DLLs, as

per the discussion on wx-dev.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/makeg95.env

@@ -30,6 +30,15 @@
 #
 MINGW32=1
 
+# set MIN_SUFFIX to nothing if you use only MinGW compiler, set it to
+# something MinGW-specific if you want to build wxWindows with more than one
+# compiler
+ifeq ($(MINGW32),1)
+  MIN_SUFFIX=_min
+else
+  MIN_SUFFIX=_cyg
+endif
+
 # Set to your gcc version. Generally 'gcc --version' tells you
 # which version you have. But it cannot distinguish between
 # 2.95.2-1 and earlier suffix versions of 2.95 . In that case,
@@ -320,7 +329,7 @@ ifdef WXUSINGDLL
   # png, jpeg, etc are exported from wx dll, so skip and save on link time.
   LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)
 else
-  LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) -lregex$(MIN_SUFFIX) -lpng$(MIN_SUFFIX) -ljpeg$(MIN_SUFFIX) -lzlib$(MIN_SUFFIX) -ltiff$(MIN_SUFFIX) $(WINLIBS) $(COMPLIBS)
 endif
 
 WINFLAGS = $(OBSOLETE_DEFINES) $(WINVERSION)
@@ -356,12 +365,12 @@ WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
 
 ifdef WXMAKINGDLL
   EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF)
 endif
 
 ifdef WXUSINGDLL
   EXTRADLLFLAGS = -DWXUSINGDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF)
 endif
 
 

src/msw/makefile.g95

@@ -21,11 +21,13 @@ include $(WXDIR)/src/makeg95.env
 
 # DLL Name, if building wxWindows as a DLL.
 ifdef WXMAKINGDLL
-WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).dll
+WXDLL = $(WXDIR)/lib/wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).dll
 WXDEF = wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).def
-DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
-                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
+                 $(WXDIR)/lib/libpng$(MIN_SUFFIX).a \
-	             $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+                 $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
 DLL_LDFLAGS = -L$(WXDIR)/lib
 DLL_BASE_LDLIBS = $(DLL_EXTRA_LIBS) -lstdc++ -lwsock32
 ifeq ($(wxUSE_GUI),0)
@@ -52,11 +54,11 @@ OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 
-ZLIBLIB = $(WXDIR)/lib/libzlib.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
-PNGLIB  = $(WXDIR)/lib/libpng.a
+PNGLIB  = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
 
 DOCDIR = $(WXDIR)/docs
 
@@ -614,7 +616,7 @@ $(TIFFLIB): $(TIFFOBJS)
 	$(RANLIB) $@
 
 $(REGEXLIB):
-	$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) WXWIN=$(WXDIR)
+	$(MAKE) -C $(REGEXDIR) -f makefile.g95 MINGW32=$(MINGW32) WXDIR=$(WXDIR) WXWIN=$(WXDIR)
 
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h
 

src/regex/makefile.g95

@@ -3,7 +3,9 @@ ifeq ($(WXWIN),)
 WXWIN=../..
 endif
 
-LIBTARGET=$(WXWIN)/lib/libregex.a
+include $(WXWIN)/src/makelib.g95
+
+LIBTARGET=$(WXWIN)/lib/libregex$(MIN_SUFFIX).a
 
 OBJECTS= \
 		regcomp.o \