X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0cb0ba509fad1fb966d4d5277ff28071d7a8477..503271a5743fb372ad7cfce3438a11e3aca782fc:/src/mgl/makefile.wat?ds=sidebyside

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 05ce7a8494..118ad35b98 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 &
@@ -57,23 +58,20 @@ GENERICOBJS= accel.obj &
 	gridctrl.obj &
 	gridsel.obj &
 	helpext.obj &
-	helphtml.obj &
-	helpwxht.obj &
 	imaglist.obj &
 	laywin.obj &
 	listctrl.obj &
 	logg.obj &
+	mdig.obj &
 	msgdlgg.obj &
 	numdlgg.obj &
 	panelg.obj &
 	printps.obj &
 	prntdlgg.obj &
 	progdlgg.obj &
-	prop.obj &
-	propform.obj &
-	proplist.obj &
 	sashwin.obj &
 	scrlwing.obj &
+	selstore.obj &
 	spinctlg.obj &
 	splash.obj &
 	splitter.obj &
@@ -84,12 +82,15 @@ GENERICOBJS= accel.obj &
 	tipdlg.obj &
 	tipwin.obj &
 	treectlg.obj &
-	treelay.obj &
 	wizard.obj
 
 COMMONOBJS = &
 	y_tab.obj &
+	accesscmn.obj &
+	appbase.obj &
 	appcmn.obj &
+	artprov.obj &
+	artstd.obj &
 	bmpbase.obj &
 	choiccmn.obj &
 	clipcmn.obj &
@@ -102,6 +103,7 @@ COMMONOBJS = &
 	cshelp.obj &
 	ctrlcmn.obj &
 	ctrlsub.obj &
+	datacmn.obj &
 	datetime.obj &
 	datstrm.obj &
 	db.obj &
@@ -114,6 +116,7 @@ COMMONOBJS = &
 	dobjcmn.obj &
 	docmdi.obj &
 	docview.obj &
+	dpycmn.obj &
 	dseldlg.obj &
 	dynarray.obj &
 	dynlib.obj &
@@ -129,6 +132,8 @@ COMMONOBJS = &
 	filefn.obj &
 	filename.obj &
 	filesys.obj &
+	fldlgcmn.obj &
+	fmapbase.obj &
 	fontcmn.obj &
 	fontmap.obj &
 	framecmn.obj &
@@ -144,9 +149,11 @@ COMMONOBJS = &
 	hashmap.obj &
 	helpbase.obj &
 	http.obj &
+	iconbndl.obj &
 	imagall.obj &
 	imagbmp.obj &
 	image.obj &
+	imagfill.obj &
 	imaggif.obj &
 	imagiff.obj &
 	imagjpeg.obj &
@@ -167,10 +174,10 @@ COMMONOBJS = &
 	menucmn.obj &
 	mimecmn.obj &
 	module.obj &
+	msgout.obj &
 	mstream.obj &
 	nbkbase.obj &
 	object.obj &
-	odbc.obj &
 	paper.obj &
 	popupcmn.obj &
 	prntbase.obj &
@@ -179,18 +186,21 @@ COMMONOBJS = &
 	quantize.obj &
 	radiocmn.obj &
 	regex.obj &
-	resource.obj &
+	rgncmn.obj &
 	sckaddr.obj &
 	sckfile.obj &
 	sckipc.obj &
 	sckstrm.obj &
+	settcmn.obj &
 	sizer.obj &
 	socket.obj &
 	statbar.obj &
+	stopwatch.obj &
 	strconv.obj &
 	stream.obj &
 	string.obj &
 	sysopt.obj &
+	taskbarcmn.obj &
 	tbarbase.obj &
 	textbuf.obj &
 	textcmn.obj &
@@ -210,7 +220,6 @@ COMMONOBJS = &
 	wfstream.obj &
 	wincmn.obj &
 	wxchar.obj &
-	wxexpr.obj &
 	xpmdecod.obj &
 	zipstrm.obj &
 	zstream.obj
@@ -272,10 +281,12 @@ UNIVOBJS = bmpbuttn.obj &
 	statusbr.obj &
 	textctrl.obj &
 	theme.obj &
+	toolbar.obj &
 	topluniv.obj &
 	winuniv.obj
 
 UNIVTHEMEOBJS = gtk.obj &
+	metal.obj &
 	win32.obj
 
 HTMLOBJS = helpctrl.obj &
@@ -294,7 +305,6 @@ HTMLOBJS = helpctrl.obj &
 	m_layout.obj &
 	m_links.obj &
 	m_list.obj &
-	m_meta.obj &
 	m_pre.obj &
 	m_style.obj &
 	m_tables.obj &
@@ -311,8 +321,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
@@ -501,6 +511,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) $<
 
@@ -512,6 +525,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) $<
 
@@ -520,9 +536,21 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 ########################################################
 # Common objects (always compiled)
 
+accesscmn.obj:     $(COMMDIR)\accesscmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+appbase.obj:     $(COMMDIR)\appbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 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) $<
 
@@ -559,6 +587,9 @@ ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+datacmn.obj:     $(COMMDIR)\datacmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -595,6 +626,9 @@ docmdi.obj:     $(COMMDIR)\docmdi.cpp
 docview.obj:     $(COMMDIR)\docview.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dpycmn.obj:     $(COMMDIR)\dpycmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dseldlg.obj:     $(COMMDIR)\dseldlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -640,6 +674,12 @@ filename.obj:     $(COMMDIR)\filename.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fldlgcmn.obj:     $(COMMDIR)\fldlgcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fmapbase.obj:     $(COMMDIR)\fmapbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -685,6 +725,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) $<
 
@@ -694,6 +737,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) $<
 
@@ -754,6 +800,9 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+msgout.obj:     $(COMMDIR)\msgout.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 mstream.obj:     $(COMMDIR)\mstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -763,9 +812,6 @@ nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-odbc.obj:     $(COMMDIR)\odbc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 paper.obj:     $(COMMDIR)\paper.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -790,7 +836,7 @@ radiocmn.obj:     $(COMMDIR)\radiocmn.cpp
 regex.obj:     $(COMMDIR)\regex.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-resource.obj:     $(COMMDIR)\resource.cpp
+rgncmn.obj:     $(COMMDIR)\rgncmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
@@ -805,6 +851,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) $<
 
@@ -814,6 +863,9 @@ socket.obj:     $(COMMDIR)\socket.cpp
 statbar.obj:     $(COMMDIR)\statbar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+stopwatch.obj:     $(COMMDIR)\stopwatch.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 strconv.obj:     $(COMMDIR)\strconv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -826,6 +878,9 @@ string.obj:     $(COMMDIR)\string.cpp
 sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -883,9 +938,6 @@ wincmn.obj:     $(COMMDIR)\wincmn.cpp
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 xpmdecod.obj:     $(COMMDIR)\xpmdecod.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -930,6 +982,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) $<
 
@@ -963,12 +1018,6 @@ gridsel.obj:     $(GENDIR)\gridsel.cpp
 helpext.obj:     $(GENDIR)\helpext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helphtml.obj:     $(GENDIR)\helphtml.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-helpwxht.obj:     $(GENDIR)\helpwxht.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 imaglist.obj:     $(GENDIR)\imaglist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -981,6 +1030,9 @@ listctrl.obj:     $(GENDIR)\listctrl.cpp
 logg.obj:     $(GENDIR)\logg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mdig.obj:     $(GENDIR)\mdig.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -999,21 +1051,15 @@ prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prop.obj:     $(GENDIR)\prop.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-propform.obj:     $(GENDIR)\propform.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-proplist.obj:     $(GENDIR)\proplist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 scrlwing.obj:     $(GENDIR)\scrlwing.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+selstore.obj:     $(GENDIR)\selstore.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 spinctlg.obj:     $(GENDIR)\spinctlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1044,9 +1090,6 @@ tipwin.obj:     $(GENDIR)\tipwin.cpp
 treectlg.obj:     $(GENDIR)\treectlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-treelay.obj:     $(GENDIR)\treelay.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 wizard.obj:     $(GENDIR)\wizard.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1104,9 +1147,6 @@ m_links.obj:     $(HTMLDIR)\m_links.cpp
 m_list.obj:     $(HTMLDIR)\m_list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-m_meta.obj:     $(HTMLDIR)\m_meta.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<