From 6f87d5542d4b6dda0c8e3bcda58f0cca21062e9e Mon Sep 17 00:00:00 2001
From: Mattia Barbon <mbarbon@cpan.org>
Date: Thu, 20 Mar 2003 20:31:43 +0000
Subject: [PATCH]   Changed g95.t according to my last changes to makefile.g95,
 and regenerated it. Updated changes.txt.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/g95.t | 22 ++++++++++++----------
 docs/changes.txt        |  4 +++-
 src/msw/makefile.g95    |  4 ++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index c4fc4bda3a..ddcadfde90 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -100,11 +100,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 \
-                 $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \
-	             $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a
+DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a \
+                 $(WXDIR)/lib/libpng$(MIN_SUFFIX).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)
@@ -131,11 +133,11 @@ OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw
 REGEXDIR= $(WXDIR)/src/regex
 
-ZLIBLIB = $(WXDIR)/lib/libzlib.a
-PNGLIB  = $(WXDIR)/lib/libpng.a
-JPEGLIB = $(WXDIR)/lib/libjpeg.a
-TIFFLIB = $(WXDIR)/lib/libtiff.a
-REGEXLIB= $(WXDIR)/lib/libregex.a
+ZLIBLIB = $(WXDIR)/lib/libzlib$(MIN_SUFFIX).a
+PNGLIB  = $(WXDIR)/lib/libpng$(MIN_SUFFIX).a
+JPEGLIB = $(WXDIR)/lib/libjpeg$(MIN_SUFFIX).a
+TIFFLIB = $(WXDIR)/lib/libtiff$(MIN_SUFFIX).a
+REGEXLIB= $(WXDIR)/lib/libregex$(MIN_SUFFIX).a
 
 DOCDIR = $(WXDIR)/docs
 
@@ -413,7 +415,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
 
diff --git a/docs/changes.txt b/docs/changes.txt
index 9fb30d760d..ddea112cbf 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -90,6 +90,8 @@ wxMSW:
 - fixes for compilation with OpenWatcom compiler
 - fixed wxStaticText best size calculation (was wrong by '&' width)
 - fixed calling wxFrame::Maximize(FALSE) before the window is shown
+- all libraries built with makefile.g95 have a _min or _cyg suffix
+  (for MinGW and Cygwin)
 
 wxMotif:
 
@@ -102,7 +104,7 @@ wxMotif:
   with Motif 1.x compatibility
 - implemented wxToggleButton
 - wxRadioBox and wxStaticBox now use the default shadow (border) style
-  instead of 
+  instead of a sunken border
 
 wxUniv:
 
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 4ac875a1ff..1be7587c1a 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -183,6 +183,7 @@ COMMONOBJS_BASEONLY  = \
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
 		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/accesscmn.$(OBJSUFF) \
 		$(COMMDIR)/artprov.$(OBJSUFF) \
 		$(COMMDIR)/artstd.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
@@ -200,6 +201,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/dobjcmn.$(OBJSUFF) \
 		$(COMMDIR)/docmdi.$(OBJSUFF) \
 		$(COMMDIR)/docview.$(OBJSUFF) \
+		$(COMMDIR)/dpycmn.$(OBJSUFF) \
 		$(COMMDIR)/dseldlg.$(OBJSUFF) \
 		$(COMMDIR)/effects.$(OBJSUFF) \
 		$(COMMDIR)/fddlgcmn.$(OBJSUFF) \
@@ -313,6 +315,7 @@ MSWOBJS     = \
 		$(MSWDIR)/dialog.$(OBJSUFF) \
 		$(MSWDIR)/dialup.$(OBJSUFF) \
 		$(MSWDIR)/dib.$(OBJSUFF) \
+		$(MSWDIR)/display.$(OBJSUFF) \
 		$(MSWDIR)/dragimag.$(OBJSUFF) \
 		$(MSWDIR)/enhmeta.$(OBJSUFF) \
 		$(MSWDIR)/evtloop.$(OBJSUFF) \
@@ -382,6 +385,7 @@ ADVANCEDOBJS_BASE = \
 ADVANCEDOBJS     = \
                 $(ADVANCEDOBJS_BASE) \
 		$(COMMDIR)/odbc.$(OBJSUFF) \
+		$(MSWDIR)/ole/access.$(OBJSUFF) \
 		$(MSWDIR)/ole/automtn.$(OBJSUFF) \
 		$(MSWDIR)/ole/dataobj.$(OBJSUFF) \
 		$(MSWDIR)/ole/dropsrc.$(OBJSUFF) \
-- 
2.45.2