From 154f22b3facdbca2cb89e091ae2ea1398bfad9d1 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 8 Nov 1999 21:14:50 +0000
Subject: [PATCH] Fixes to Cygwin/Mingw32 makefile, manual now compiles
 wxStaticLine, etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/makefile.rsp   | 35 -----------------------------------
 distrib/msw/tmake/g95.t    | 22 ++++++++++++++++------
 docs/latex/wx/classes.tex  |  1 +
 docs/latex/wx/helpinst.tex | 31 +++++++++++++++++++++++++------
 docs/latex/wx/manual.tex   |  6 +++---
 docs/latex/wx/statline.tex |  2 +-
 docs/latex/wx/wxPython.tex | 23 ++++-------------------
 docs/motif/install.txt     |  6 +++---
 docs/msw/install.txt       | 23 +++++++++++++++--------
 include/wx/db.h            |  2 +-
 include/wx/dbtable.h       |  2 +-
 include/wx/msw/setup0.h    | 16 +++-------------
 src/makeg95.env            |  2 +-
 src/makeprog.b32           |  2 +-
 src/msw/makefile.g95       | 21 +++++++++++++++------
 15 files changed, 90 insertions(+), 104 deletions(-)

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 187845785b..aa881eb035 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -55,38 +55,3 @@ utils/Makefile.in
 utils/wxMMedia2/Makefile.in
 utils/wxMMedia2/lib/Makefile.in
 utils/wxMMedia2/sample/Makefile.in
-include/wx/msw/Makefile.am
-include/wx/msw/ctl3d/Makefile.am
-include/wx/msw/gnuwin32/Makefile.am
-misc/Makefile.am
-misc/afm/Makefile.am
-misc/gs_afm/Makefile.am
-samples/animatn/Makefile.am
-samples/db/Makefile.am
-samples/forty/Makefile.am
-samples/fractal/Makefile.am
-samples/grid/Makefile.am
-samples/help/Makefile.am
-samples/internat/Makefile.am
-samples/joytest/Makefile.am
-samples/memcheck/Makefile.am
-samples/mfc/Makefile.am
-samples/nativdlg/Makefile.am
-samples/oleauto/Makefile.am
-samples/ownerdrw/Makefile.am
-samples/png/Makefile.am
-samples/regtest/Makefile.am
-samples/resource/Makefile.am
-samples/richedit/Makefile.am
-samples/tab/Makefile.am
-samples/taskbar/Makefile.am
-samples/scrollsub/Makefile.am
-samples/font/Makefile.am
-samples/menu/Makefile.am
-samples/drawing/Makefile.am
-samples/scroll/Makefile.am
-samples/scrollsub/Makefile.am
-samples/console/Makefile.am
-samples/wizard/Makefile.am
-utils/glcanvas/motif/Makefile.am
-src/msw/Makefile.am
diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 51ccf73146..64d65ba3b1 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -16,7 +16,7 @@
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version
         if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
-            next unless $file =~ /^dirdlgg\./;
+            next #! unless $file =~ /^dirdlgg\./;
         }
 
         $file =~ s/cp?p?$/\$(OBJSUFF)/;
@@ -109,6 +109,18 @@ JPEGLIB = $(WXDIR)/lib/libjpeg.a
 
 DOCDIR = $(WXDIR)\docs
 
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+		DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+
 GENERICOBJS = \
                 #$ ExpandList("WXGENERICOBJS");
 
@@ -219,16 +231,14 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)
-
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
 endif
 
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 0e189a763f..9a1e78ac43 100644
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -202,6 +202,7 @@
 \input splitter.tex
 \input statbmp.tex
 \input statbox.tex
+\input statline.tex
 \input stattext.tex
 \input statusbr.tex
 \input strmbase.tex
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 8d8bdff00d..ae62551e17 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -13,18 +13,33 @@ when it starts, and immediately call {\bf Initialize}\rtfsp
 to associate a filename with it. The help viewer will only get run, however,
 just before the first call to display something.
 
-Although all help controller classes actually derive from wxHelpControllerBase and have
-names of the form wxXXXHelpController, the
-appropriate class is aliased to the name wxHelpController for each platform.
+Most help controller classes actually derive from wxHelpControllerBase and have
+names of the form wxXXXHelpController or wxHelpControllerXXX. An
+appropriate class is aliased to the name wxHelpController for each platform, as follows:
+
+\begin{itemize}\itemsep=0pt
+\item On Windows, wxWinHelpController is used.
+\item On all other platforms, wxHelpControllerHtml is used if wxHTML is
+compiled into wxWindows; otherwise wxExtHelpController is used (for invoking an external
+browser).
+\end{itemize}
+
+The remaining help controller classess need to be named
+explicitly by an application that wishes to make use of them.
 
 There are currently the following help controller classes defined:
 
 \begin{itemize}\itemsep=0pt
 \item wxWinHelpController, for controlling Windows Help.
 \item wxExtHelpController, for controlling external browsers under Unix.
-The default browser is Netscape Navigator.
-\item wxHelpControllerHtml, using wxHTML to display help
-\item wxXLPHelpController, for controlling wxHelp (from wxWindows 1).
+The default browser is Netscape Navigator. The 'help' sample shows its use.
+\item wxHelpControllerHtml, using \helpref{wxHTML}{wxhtml} to display help. The API for this class
+is reasonably close to the wxWindows help controller API; see {\tt wx/helpwxht.h} for
+details of use.
+\item \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}, a more sophisticated help controller using \helpref{wxHTML}{wxhtml}, in
+a similar style to the Windows HTML Help viewer and using some of the same files.
+The API is not the same as the standard API, which is why it is documented separately.
+\item wxXLPHelpController, for controlling wxHelp (from wxWindows 1). Obsolete.
 \end{itemize}
 
 \wxheading{Derived from}
@@ -41,6 +56,10 @@ wxHelpControllerBase\\
 <wx/generic/helpwxht.h> (wxHTML based help controller)
 <wx/generic/helpxlp.h> (wxHelp controller)
 
+\wxheading{See also}
+
+\helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}, \helpref{wxHTML}{wxhtml}
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxHelpController::wxHelpController}
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 73312a4bc7..a66d310f34 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -31,7 +31,7 @@
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{November 1st 1999}
+\date{November 8th 1999}
 }
 \makeindex
 \begin{document}
@@ -86,9 +86,9 @@ Robin Dunn, et al}
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \begin{center}
-Copyright \copyright{}  1999 Julian Smart, Robert Roebling, Vadim Zeitlin and other
+(c)  1999 Julian Smart, Robert Roebling, Vadim Zeitlin and other
 members of the wxWindows team\\
-Portions \copyright{} 1996 Artificial Intelligence Applications Institute\\
+Portions (c) 1996 Artificial Intelligence Applications Institute\\
 \end{center}
 
 Please see the wxWindows licence files (preamble.txt, lgpl.txt, gpl.txt, licence.txt,
diff --git a/docs/latex/wx/statline.tex b/docs/latex/wx/statline.tex
index 3c506f9e72..d304f367f3 100644
--- a/docs/latex/wx/statline.tex
+++ b/docs/latex/wx/statline.tex
@@ -78,7 +78,7 @@ Returns TRUE if the line is vertical, FALSE if horizontal.
 
 \func{int}{GetDefaultSize}{\void}
 
-This static function returns the size which will be given to the "lesser"
+This static function returns the size which will be given to the smaller
 dimension of the static line, i.e. its height for a horizontal line or its
 width for a vertical one.
 
diff --git a/docs/latex/wx/wxPython.tex b/docs/latex/wx/wxPython.tex
index b4605b5d8f..0670ae6bf1 100644
--- a/docs/latex/wx/wxPython.tex
+++ b/docs/latex/wx/wxPython.tex
@@ -113,7 +113,7 @@ to use the GUI portions.
 There are quite a few other GUI modules available for Python, some in
 active use, some that havn't been updated for ages. Most are simple
 wrappers around some C or C++ toolkit or another, and most are not
-cross-platform compatible. See \urlref{this link}{http://www.python.org/download/Contributed.html\#Graphics}
+cross-platform compatible. See \urlref{this link}{http://www.python.org/download/Contributed.html\#Graphics} 
 for a listing of a few of them.
 
 %----------------------------------------------------------------------
@@ -159,16 +159,13 @@ You can use whatever flags you want, but I know these work.
 
 For Win32 systems I use Visual C++ 6.0, but 5.0 should work also. The
 build utility currently does not support any other Win32 compilers.
-
 \item At this point you may want to make an alias or symlink, script,
 batch file, whatever on the PATH that invokes \tt{\$(WXWIN)/utils/wxPython/distrib/build.py} to
 help simplify matters somewhat. For example, on my Win32 system I have a file named
  \tt{build}.bat in a directory on the PATH that contains:
 
 \tt{python \%WXWIN/utils/wxPython/distrib/build.py \%1 \%2 \%3 \%4 \%5 \%6}
-
 \item Change into the \tt{\$(WXWIN)/utils/wxPython/src} directory.
-
 \item Type "\tt{build -b}" to build wxPython and "\tt{build -i}" to
 install it, or "\tt{build -bi}" to do both steps at once.
 
@@ -178,13 +175,10 @@ If you have troubles building or you want it built or installed in
 a different way, take a look at the docstring in build.py. You are
 able to to override many configuration options in a file named
 build.local.
-
 \item To build and install the add-on modules, change to the appropriate
 directory under \tt{\$(WXWIN)/utils/wxPython/modules} and run the build
 utility again.
-
 \item Change to the \tt{\$(WXWIN)/utils/wxPython/demo} directory.
-
 \item Try executing the demo program. For example:
 
 \tt{python demo.py}
@@ -295,13 +289,12 @@ it by issuing this command:
 
 \wxheading{Things to notice}
 
-\begin{enumerate}\itemsep=0pt
+\begin{enumerate}\itemsep=11pt
 \item At line 2 the wxPython classes, constants, and etc. are imported
 into the current module's namespace. If you prefer to reduce
 namespace pollution you can use "\tt{from wxPython import wx}" and
 then access all the wxPython identifiers through the wx module, for
 example, "\tt{wx.wxFrame}".
-
 \item At line 13 the frame's sizing and moving events are connected to
 methods of the class. These helper functions are intended to be like
 the event table macros that wxWindows employs. But since static event
@@ -309,11 +302,9 @@ tables are impossible with wxPython, we use helpers that are named the
 same to dynamically build the table. The only real difference is
 that the first arguemnt to the event helpers is always the window that
 the event table entry should be added to.
-
 \item Notice the use of \tt{wxDLG\_PNT} and \tt{wxDLG\_SZE} in lines 19
 - 29 to convert from dialog units to pixels. These helpers are unique
 to wxPython since Python can't do method overloading like C++.
-
 \item There is an \tt{OnCloseWindow} method at line 34 but no call to
 EVT\_CLOSE to attach the event to the method. Does it really get
 called?  The answer is, yes it does. This is because many of the
@@ -322,7 +313,6 @@ called?  The answer is, yes it does. This is because many of the
 C++ classes in this area to determine what is \em{standard} but since
 that changes from time to time I can make no guarentees, nor will it
 be fully documented. When in doubt, use an EVT\_*** function.
-
 \item At lines 17 to 21 notice that there are no saved references to
 the panel or the static text items that are created. Those of you
 who know Python might be wondering what happens when Python deletes
@@ -334,13 +324,11 @@ when necessary. For this reason, most wxPython objects do not need to
 have a \_\_del\_\_ method that explicitly causes the C++ object to be
 deleted. If you ever have the need to forcibly delete a window, use
 the Destroy() method as shown on line 36.
-
 \item Just like wxWindows in C++, wxPython apps need to create a class
 derived from \tt{wxApp} (line 56) that implements a method named
 \tt{OnInit}, (line 59.) This method should create the application's
 main window (line 62) and use \tt{wxApp.SetTopWindow()} (line 66) to
 inform wxWindows about it.
-
 \item And finally, at line 72 an instance of the application class is
 created. At this point wxPython finishes initializing itself, and calls
 the \tt{OnInit} method to get things started. (The zero parameter here is
@@ -495,7 +483,7 @@ as possible to the C++ spec over time.
 \item \helpref{wxStaticBitmap}{wxstaticbitmap}
 \item \helpref{wxStaticBox}{wxstaticbox}
 \item \helpref{wxStaticBoxSizer}{wxstaticboxsizer}
-\item wxStaticLine
+\item \helpref{wxStaticLine}{wxstaticline}
 \item \helpref{wxStaticText}{wxstatictext}
 \item \helpref{wxStatusBar}{wxstatusbar}
 \item \helpref{wxSysColourChangedEvent}{wxsyscolourchangedevent}
@@ -514,16 +502,13 @@ as possible to the C++ spec over time.
 \item \helpref{wxValidator}{wxvalidator}
 \item \helpref{wxWindowDC}{wxwindowdc}
 \item \helpref{wxWindow}{wxwindow}
-
-
-
 \end{itemize}
 
 %----------------------------------------------------------------------
 \section{Where to go for help}\label{wxphelp}
 
 Since wxPython is a blending of multiple technologies, help comes from
-multiple sources. See
+multiple sources. See 
 \urlref{http://alldunn.com/wxPython}{http://alldunn.com/wxPython} for details on
 various sources of help, but probably the best source is the
 wxPython-users mail list. You can view the archive or subscribe by
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 99459b20d3..62f4bf05bd 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -1,4 +1,4 @@
-wxWindows 2.0 for Motif installation
+wxWindows 2.1 for Motif installation
 ------------------------------------
 
 IMPORTANT NOTE:
@@ -20,8 +20,8 @@ First steps
   (not yet tested). Motif 2.0 and above may also be suitable.
 
 - Download the appropriate .tgz archive, or alternatively the files
-  wx200gen.zip and wx200mot.zip. Download documentation in a preferred format,
-  such as wx200htm.zip or wx200pdf.zip.
+  wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a preferred format,
+  such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
   directory. If using the zip archives, use the -a option if available
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index c083670c54..dee174b790 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -2,21 +2,22 @@
 Installing wxWindows 2.1
 ------------------------
 
-This is a snapshot release of wxWindows 2.1 for
-Microsoft Windows 95, 98 and NT. This is not a production release,
+This is a beta release of wxWindows 2.1 for Microsoft
+Windows 95, 98 and NT. This is not a production release,
 although a huge number of bugs found in wxWindows 2.0 have been
 fixed.
 
 IMPORTANT NOTE: If you experience problems installing, please
-re-read this instructions and other related files (todo.txt,
-bugs.txt etc.) carefully before mailing wxwin-users or
+re-read this instructions and other related files (release.txt,
+todo.txt, bugs.txt etc.) carefully before mailing wxwin-users or
 the author. Preferably, try to fix the problem first and
-then send a patch to the author.
+then send a patch to the author. Please report bugs using the
+bug report form on the wxWindows web site.
 
 Unarchiving
 -----------
 
-A setup program is provided to automatically copy files to a
+A setup program is provided (setup.exe) to automatically copy files to a
 directory on your hard disk. Do not install into a path that contains spaces.
 The installation program should set the WXWIN environment variable, which
 will be activated when your machine is rebooted. The setup
@@ -223,6 +224,11 @@ same alignment, or you could experience mysterious crashes. To
 change the alignment, add a suitable option to the $(CFG) target code
 in src/msw/makefile.b32.
 
+Note (4): if you get undefined _SQL... symbols at link time,
+either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
+directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
+recompile wxWindows. The same applies if compiling using the IDE.
+
 Compiling using the IDE files:
 
 1. Load src\bc32.ide (Release settings)
@@ -394,6 +400,9 @@ and other intermediate compiler files.
 
 Notes:
 
+- See also the Cygwin/Mingw32 on the web site or CD-ROM for
+  further information about using wxWindows with these compilers.
+
 - libwx.a is 48 MB or more - but much less if compiled with no
   debug info (-g0) and level 4 optimization (-O4).
 
@@ -401,8 +410,6 @@ Notes:
   isn't available with Cygwin. However, you can use it with external
   decompression utilities.
 
-- Doesn't compile src/msw/ole files, so no drag and drop.
-
 - There's a bug in Mingw32 headers for some early distributions.
 
   in include/windows32/defines.h, where it says:
diff --git a/include/wx/db.h b/include/wx/db.h
index c624086c26..2d39f12b9c 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -428,7 +428,7 @@ struct DbList
 };
 
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
 #include "wx/object.h"
 class CstructTablesInUse : public wxObject
 {
diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index 14acecbeb2..a07217ba8b 100644
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -187,7 +187,7 @@ public:
 	bool	SetNull(int colNo);
 	bool	SetNull(char *colName);
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
 	ULONG	GetTableID() { return tableID; };
 #endif
 
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 73add4e890..bcf7216e30 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -402,15 +402,13 @@
 
 #endif
 
-#if defined(__WXMSW__) && defined(__BORLANDC__)
-#undef wxUSE_ODBC
-#define wxUSE_ODBC 0
-#endif
-
 // BC++/Win16 can't cope with the amount of data in resource.cpp
 #if defined(__WIN16__) && defined(__BORLANDC__)
 #undef wxUSE_WX_RESOURCES
 #define wxUSE_WX_RESOURCES        0
+
+#undef wxUSE_ODBC
+#define wxUSE_ODBC                0
 #endif
 
 #if defined(__WXMSW__) && defined(__WATCOMC__)
@@ -452,13 +450,5 @@
 
 #endif
 
-// Problem with VC++ 5 and dobjcmn.cpp
-/*
-#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-*/
-
 #endif
     // _WX_SETUP_H_
diff --git a/src/makeg95.env b/src/makeg95.env
index 36a2a1d03a..9c40db3f39 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -7,7 +7,7 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
-MINGW32=1
+MINGW32=0
 
 # Set to the version you have
 MINGW32VERSION=2.95
diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 5f879ff864..fd48fb643f 100644
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg odbc32
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f627f8fa90..660dc9e399 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -39,10 +39,21 @@ JPEGLIB = $(WXDIR)/lib/libjpeg.a
 
 DOCDIR = $(WXDIR)\docs
 
+# Only use the WIN32 wxDirDialog if we have a recent
+# version of Mingw32
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+		DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
+  else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+  endif
+else
+		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
+endif
+
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
-		$(GENDIR)/dirdlgg.$(OBJSUFF) \
 		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
@@ -369,16 +380,14 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
 
-#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)  
-
 ifeq ($(MINGW32),1)
   ifeq ($(MINGW32VERSION),2.95)
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
   else
-    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
   endif
 else
-  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) # $(XPMOBJECTS)
 endif
 
 all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)
-- 
2.50.0

