X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c08a4f0068a616f3726fd0403b3b75caac3fa702..ba14d9861d043d53cc53ea70a2fab4146f7be9f3:/src/mgl/makefile.wat diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat index 66ce15ec98..82ffbcd8f4 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 & @@ -58,7 +59,6 @@ GENERICOBJS= accel.obj & gridsel.obj & helpext.obj & helphtml.obj & - helpwxht.obj & imaglist.obj & laywin.obj & listctrl.obj & @@ -90,6 +90,8 @@ GENERICOBJS= accel.obj & COMMONOBJS = & y_tab.obj & appcmn.obj & + artprov.obj & + artstd.obj & bmpbase.obj & choiccmn.obj & clipcmn.obj & @@ -144,9 +146,11 @@ COMMONOBJS = & hashmap.obj & helpbase.obj & http.obj & + iconbndl.obj & imagall.obj & imagbmp.obj & image.obj & + imagfill.obj & imaggif.obj & imagiff.obj & imagjpeg.obj & @@ -184,6 +188,7 @@ COMMONOBJS = & sckfile.obj & sckipc.obj & sckstrm.obj & + settcmn.obj & sizer.obj & socket.obj & statbar.obj & @@ -277,6 +282,7 @@ UNIVOBJS = bmpbuttn.obj & winuniv.obj UNIVTHEMEOBJS = gtk.obj & + metal.obj & win32.obj HTMLOBJS = helpctrl.obj & @@ -312,8 +318,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 @@ -516,6 +522,9 @@ winuniv.obj: $(UNIVDIR)\winuniv.cpp gtk.obj: $(UNIVTHEMEDIR)\gtk.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +metal.obj: $(UNIVTHEMEDIR)\metal.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + win32.obj: $(UNIVTHEMEDIR)\win32.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -527,6 +536,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) $< @@ -689,6 +704,9 @@ helpbase.obj: $(COMMDIR)\helpbase.cpp http.obj: $(COMMDIR)\http.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +iconbndl.obj: $(COMMDIR)\iconbndl.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + imagall.obj: $(COMMDIR)\imagall.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -698,6 +716,9 @@ imagbmp.obj: $(COMMDIR)\imagbmp.cpp image.obj: $(COMMDIR)\image.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +imagfill.obj: $(COMMDIR)\imagfill.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + imaggif.obj: $(COMMDIR)\imaggif.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -809,6 +830,9 @@ sckipc.obj: $(COMMDIR)\sckipc.cpp sckstrm.obj: $(COMMDIR)\sckstrm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +settcmn.obj: $(COMMDIR)\settcmn.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + sizer.obj: $(COMMDIR)\sizer.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -934,6 +958,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) $< @@ -970,9 +997,6 @@ helpext.obj: $(GENDIR)\helpext.cpp helphtml.obj: $(GENDIR)\helphtml.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -helpwxht.obj: $(GENDIR)\helpwxht.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - imaglist.obj: $(GENDIR)\imaglist.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $<