Fix MinGW compilation in some corner cases

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index 9de7c9be06ead06e2e00a2af5d35609640529055..7fb2d7fd44c9db0c119df9a4f8a20ab5c432a562 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -416,7 +416,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
 

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 1cb2601500aad807aeca63f715dcda0870068846..37cb09f520e39c630bcd7c8c125ea73a46de1206 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -618,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