X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68c675a6185129c2c174622ed718a77371b7e3f5..096ed1c628e9745420807b0cebbcac0b485c9648:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5cbb6b5f52..a0cdc935ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,7 +232,6 @@ ALL_BASE_HEADERS =  \
 	wx/config.h \
 	wx/containr.h \
 	wx/datetime.h \
-	wx/datetime.inl \
 	wx/datstrm.h \
 	wx/dde.h \
 	wx/debug.h \
@@ -1355,6 +1354,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
 	wx/msw/gccpriv.h \
 	wx/msw/mimetype.h \
 	wx/msw/stackwalk.h \
+	wx/msw/stdpaths.h \
 	wx/msw/winundef.h \
 	wx/msw/wrapcctl.h \
 	wx/msw/wrapcdlg.h \
@@ -1446,8 +1446,12 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 	wx/msw/helpwin.h
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
 @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
-@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = wx/msw/popupwin.h \
-@COND_TOOLKIT_WINCE@	    wx/msw/uxtheme.h
+COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
+	wx/msw/popupwin.h \
+	wx/msw/uxtheme.h \
+	wx/msw/uxthemep.h \
+	wx/msw/htmlhelp.h
+@COND_TOOLKIT_WINCE@LOWLEVEL_HDR = $(COND_TOOLKIT_WINCE_LOWLEVEL_HDR)
 COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 	wx/generic/caret.h \
 	wx/unix/fontutil.h \
@@ -1943,26 +1947,19 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/csquery.bmp \
 	wx/msw/blank.cur \
 	wx/msw/bullseye.cur \
-	wx/msw/clock.cur \
 	wx/msw/cross.cur \
 	wx/msw/hand.cur \
-	wx/msw/heart.cur \
 	wx/msw/magnif1.cur \
-	wx/msw/noentry.cur \
 	wx/msw/pbrush.cur \
 	wx/msw/pencil.cur \
 	wx/msw/pntleft.cur \
 	wx/msw/pntright.cur \
-	wx/msw/query.cur \
 	wx/msw/rightarr.cur \
 	wx/msw/roller.cur \
-	wx/msw/size.cur \
-	wx/msw/watch1.cur \
 	wx/msw/cdrom.ico \
 	wx/msw/child.ico \
 	wx/msw/computer.ico \
 	wx/msw/drive.ico \
-	wx/msw/error.ico \
 	wx/msw/file1.ico \
 	wx/msw/floppy.ico \
 	wx/msw/folder1.ico \
@@ -2148,26 +2145,19 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/csquery.bmp \
 	wx/msw/blank.cur \
 	wx/msw/bullseye.cur \
-	wx/msw/clock.cur \
 	wx/msw/cross.cur \
 	wx/msw/hand.cur \
-	wx/msw/heart.cur \
 	wx/msw/magnif1.cur \
-	wx/msw/noentry.cur \
 	wx/msw/pbrush.cur \
 	wx/msw/pencil.cur \
 	wx/msw/pntleft.cur \
 	wx/msw/pntright.cur \
-	wx/msw/query.cur \
 	wx/msw/rightarr.cur \
 	wx/msw/roller.cur \
-	wx/msw/size.cur \
-	wx/msw/watch1.cur \
 	wx/msw/cdrom.ico \
 	wx/msw/child.ico \
 	wx/msw/computer.ico \
 	wx/msw/drive.ico \
-	wx/msw/error.ico \
 	wx/msw/file1.ico \
 	wx/msw/floppy.ico \
 	wx/msw/folder1.ico \
@@ -24351,8 +24341,18 @@ MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
 	cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
 	cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
+	mkdir $(DISTDIR)/include/wx/mac/corefoundation
+	cp $(INCDIR)/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
+	mkdir $(DISTDIR)/src/mac/corefoundation
+	cp $(MACDIR)/corefoundation/*.cpp $(DISTDIR)/src/mac/corefoundation
+	mkdir $(DISTDIR)/src/html/htmlctrl
+	mkdir $(DISTDIR)/src/html/htmlctrl/webkit
+	cp $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
+	mkdir $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
-	cp $(MACDIR)/carbon/*.c $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.mm $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.icns $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
 	cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
 	mkdir $(DISTDIR)/src/mac/carbon/morefile
@@ -24381,6 +24381,7 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw
+	cp $(INCDIR)/wx/msw/wx.manifest $(DISTDIR)/include/wx/msw
 	cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole
 	cp $(INCDIR)/wx/msw/wince/*.h $(DISTDIR)/include/wx/msw/wince
 	mkdir $(DISTDIR)/src/msw/ole
@@ -24452,6 +24453,7 @@ DEMOS_DIST: ALL_GUI_DIST
 	cp $(DEMODIR)/forty/*.cpp $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xpm $(DISTDIR)/demos/forty
 	cp $(DEMODIR)/forty/*.xbm $(DISTDIR)/demos/forty
+	cp $(DEMODIR)/forty/*.htm $(DISTDIR)/demos/forty
 
 	mkdir $(DISTDIR)/demos/life
 	mkdir $(DISTDIR)/demos/life/bitmaps
@@ -24858,7 +24860,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate
 	cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate
-	cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate
+	cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate
 
 	mkdir $(DISTDIR)/samples/richedit
 	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit