X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67e2efca87e3d3142ca545d9855748da15eac894..0598e263cecc205aff9a6735cf41803205fabbcb:/src/msw/makefile.g95?ds=inline

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 4b63f3a301..37cb09f520 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)
@@ -183,6 +183,8 @@ COMMONOBJS_BASEONLY  = \
 COMMONOBJS  = \
                 $(COMMONOBJS_BASE) \
 		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/artprov.$(OBJSUFF) \
+		$(COMMDIR)/artstd.$(OBJSUFF) \
 		$(COMMDIR)/choiccmn.$(OBJSUFF) \
 		$(COMMDIR)/clipcmn.$(OBJSUFF) \
 		$(COMMDIR)/cmdproc.$(OBJSUFF) \
@@ -208,9 +210,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) \
@@ -230,6 +234,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/quantize.$(OBJSUFF) \
 		$(COMMDIR)/radiocmn.$(OBJSUFF) \
 		$(COMMDIR)/resource.$(OBJSUFF) \
+		$(COMMDIR)/settcmn.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/statbar.$(OBJSUFF) \
 		$(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -329,6 +334,7 @@ MSWOBJS     = \
 		$(MSWDIR)/helpwin.$(OBJSUFF) \
 		$(MSWDIR)/icon.$(OBJSUFF) \
 		$(MSWDIR)/imaglist.$(OBJSUFF) \
+		$(MSWDIR)/iniconf.$(OBJSUFF) \
 		$(MSWDIR)/joystick.$(OBJSUFF) \
 		$(MSWDIR)/listbox.$(OBJSUFF) \
 		$(MSWDIR)/listctrl.$(OBJSUFF) \
@@ -345,6 +351,7 @@ MSWOBJS     = \
 		$(MSWDIR)/palette.$(OBJSUFF) \
 		$(MSWDIR)/pen.$(OBJSUFF) \
 		$(MSWDIR)/penwin.$(OBJSUFF) \
+		$(MSWDIR)/popupwin.$(OBJSUFF) \
 		$(MSWDIR)/printdlg.$(OBJSUFF) \
 		$(MSWDIR)/printwin.$(OBJSUFF) \
 		$(MSWDIR)/radiobox.$(OBJSUFF) \
@@ -501,7 +508,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)
@@ -513,20 +520,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
@@ -619,7 +618,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