X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47dddc2f4bfdc2f44f6cf6f5ec33c409da7c0c35..fbf456aa8952c6d2d3edeea1208b0e3159a3cb8d:/src/mgl/makefile.wat diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 40f1caf6c4..cf53427e6c 100644 --- a/src/mgl/makefile.wat +++ b/src/mgl/makefile.wat @@ -46,6 +46,7 @@ GENERICOBJS= accel.obj & caret.obj & choicdgg.obj & colrdlgg.obj & + dcbuffer.obj & dcpsg.obj & dirctrlg.obj & dirdlgg.obj & @@ -80,6 +81,7 @@ GENERICOBJS= accel.obj & tabg.obj & tbarsmpl.obj & textdlgg.obj & + timer.obj & tipdlg.obj & tipwin.obj & treectlg.obj & @@ -89,6 +91,8 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + artprov.obj & + artstd.obj & bmpbase.obj & choiccmn.obj & clipcmn.obj & @@ -236,7 +240,6 @@ MGLOBJS = app.obj & pen.obj & region.obj & settings.obj & - timer.obj & toplevel.obj & utils.obj & window.obj @@ -272,6 +275,7 @@ UNIVOBJS = bmpbuttn.obj & statusbr.obj & textctrl.obj & theme.obj & + toolbar.obj & topluniv.obj & winuniv.obj @@ -311,8 +315,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 @@ -394,9 +398,6 @@ region.obj: $(MGLDIR)\region.cpp settings.obj: $(MGLDIR)\settings.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -timer.obj: $(MGLDIR)\timer.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - toplevel.obj: $(MGLDIR)\toplevel.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -504,6 +505,9 @@ textctrl.obj: $(UNIVDIR)\textctrl.cpp theme.obj: $(UNIVDIR)\theme.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +toolbar.obj: $(UNIVDIR)\toolbar.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + topluniv.obj: $(UNIVDIR)\topluniv.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -526,6 +530,12 @@ win32.obj: $(UNIVTHEMEDIR)\win32.cpp appcmn.obj: $(COMMDIR)\appcmn.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +artprov.obj: $(COMMDIR)\artprov.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + +artstd.obj: $(COMMDIR)\artstd.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + bmpbase.obj: $(COMMDIR)\bmpbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -933,6 +943,9 @@ choicdgg.obj: $(GENDIR)\choicdgg.cpp colrdlgg.obj: $(GENDIR)\colrdlgg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dcbuffer.obj: $(GENDIR)\dcbuffer.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + dcpsg.obj: $(GENDIR)\dcpsg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1035,6 +1048,9 @@ tbarsmpl.obj: $(GENDIR)\tbarsmpl.cpp textdlgg.obj: $(GENDIR)\textdlgg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +timer.obj: $(GENDIR)\timer.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + tipdlg.obj: $(GENDIR)\tipdlg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $<