X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c448540d81ebf3dac4a3abc085c6a47c1522a17a..0bc836492ec7755ce031f6a3111228acad16c5f7:/distrib/msw/tmake/g95.t

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index f720c1d5ad..f1c494ef52 100644
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -142,7 +142,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)
@@ -306,7 +306,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)
@@ -318,20 +318,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
@@ -351,9 +343,12 @@ $(ARCHINCDIR)/wx:
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR))
 	mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
+# Copy ALWAYS uses forward slashes now.
+
 $(SETUP_H): $(ARCHINCDIR)/wx
-	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+	$(COPY) $(WXDIR)/include/wx/msw/setup.h $(subst $(BACKSLASH),/,$@)
 
+#	$(COPY) $(WXDIR)/include/wx/msw/setup.h $@
 #	$(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
 
 ifndef WXMAKINGDLL
@@ -424,7 +419,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