X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f435c1f030721cd3ab023ae346f895924c29c8e8..ddfca47f05f821f034514bf5d5cf938d80fa2829:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index ca3ac9e5f2..1043e14499 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -63,7 +63,7 @@ DOCDIR = $(WXDIR)/docs
 # Only use the WIN32 wxDirDialog if we have a recent
 # version of Mingw32
 ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+  ifneq "$(_GCC295)$(_GCC3)" ""
 		DIRDLGOBJ = $(MSWDIR)/dirdlg.$(OBJSUFF)
   else
 		DIRDLGOBJ = $(GENDIR)/dirdlgg.$(OBJSUFF)
@@ -149,6 +149,7 @@ COMMONOBJS_BASE  = \
 		$(COMMDIR)/memory.$(OBJSUFF) \
 		$(COMMDIR)/mimecmn.$(OBJSUFF) \
 		$(COMMDIR)/module.$(OBJSUFF) \
+		$(COMMDIR)/msgout.$(OBJSUFF) \
 		$(COMMDIR)/mstream.$(OBJSUFF) \
 		$(COMMDIR)/object.$(OBJSUFF) \
 		$(COMMDIR)/process.$(OBJSUFF) \
@@ -210,9 +211,11 @@ COMMONOBJS  = \
 		$(COMMDIR)/geometry.$(OBJSUFF) \
 		$(COMMDIR)/gifdecod.$(OBJSUFF) \
 		$(COMMDIR)/helpbase.$(OBJSUFF) \
+		$(COMMDIR)/iconbndl.$(OBJSUFF) \
 		$(COMMDIR)/imagall.$(OBJSUFF) \
 		$(COMMDIR)/imagbmp.$(OBJSUFF) \
 		$(COMMDIR)/image.$(OBJSUFF) \
+		$(COMMDIR)/imagfill.$(OBJSUFF) \
 		$(COMMDIR)/imaggif.$(OBJSUFF) \
 		$(COMMDIR)/imagiff.$(OBJSUFF) \
 		$(COMMDIR)/imagjpeg.$(OBJSUFF) \
@@ -232,6 +235,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
 		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/settcmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -331,6 +335,7 @@ MSWOBJS     = \
 		$(MSWDIR)/helpwin.$(OBJSUFF) \
 		$(MSWDIR)/icon.$(OBJSUFF) \
 		$(MSWDIR)/imaglist.$(OBJSUFF) \
+		$(MSWDIR)/iniconf.$(OBJSUFF) \
 		$(MSWDIR)/joystick.$(OBJSUFF) \
 		$(MSWDIR)/listbox.$(OBJSUFF) \
 		$(MSWDIR)/listctrl.$(OBJSUFF) \
@@ -347,6 +352,7 @@ MSWOBJS     = \
 		$(MSWDIR)/palette.$(OBJSUFF) \
 		$(MSWDIR)/pen.$(OBJSUFF) \
 		$(MSWDIR)/penwin.$(OBJSUFF) \
+		$(MSWDIR)/popupwin.$(OBJSUFF) \
 		$(MSWDIR)/printdlg.$(OBJSUFF) \
 		$(MSWDIR)/printwin.$(OBJSUFF) \
 		$(MSWDIR)/radiobox.$(OBJSUFF) \
@@ -503,7 +509,7 @@ TIFFOBJS = $(TIFFDIR)/tif_aux.o \
 		$(TIFFDIR)/tif_zip.o
 
 ifeq ($(MINGW32),1)
-  ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
+  ifneq "$(_GCC295)$(_GCC3)" ""
     OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) $(ADVANCEDOBJS)
   else
     OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ)
@@ -515,20 +521,12 @@ ifeq ($(wxUSE_GUI),0)
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 
-# MBN: if anyone has a better solution for this kludge, step
-#      forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
-
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)
-ifeq (,$(findstring /,$(PATH)))
-  IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))
   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else
-  IS_CYGWIN=1
   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
@@ -621,7 +619,7 @@ $(TIFFLIB): $(TIFFOBJS)
 	$(RANLIB) $@
 
 $(REGEXLIB):
-	$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR)
+	$(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) WXWIN=$(WXDIR)
 
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h