use wxUniv's setup

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

diff --git a/distrib/msw/tmake/watmgl.t b/distrib/msw/tmake/watmgl.t
index 96a32892a34557e4fc3b939af4733724389edf7f..d5fa4e24e3262fa5db6992c7b42cc8077f1a8965 100644 (file)
--- a/distrib/msw/tmake/watmgl.t
+++ b/distrib/msw/tmake/watmgl.t
@@ -127,8 +127,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 66ce15ec981acda0bb0d9d4c14ecddb5b1dcc5e5..6313d2c0fdeb7c11bd2ce4b23e997fa6ed26b8fb 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -312,8 +312,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc