From: Robin Dunn Date: Wed, 23 Jul 2003 23:21:19 +0000 (+0000) Subject: Added missing header files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e4a7bbfc1ebf7434b7c291e6fb4a060dcd9b0aee?ds=inline Added missing header files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 5876829e2c..0292b173eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -167,26 +167,27 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_1_WXUNIV_0@ wx/bitmap.h wx/busyinfo.h wx/calctrl.h wx/caret.h \ @COND_USE_GUI_1_WXUNIV_0@ wx/clipbrd.h wx/cmdproc.h wx/colordlg.h \ @COND_USE_GUI_1_WXUNIV_0@ wx/colour.h wx/cshelp.h wx/dataobj.h wx/dbgrid.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/dcbuffer.h wx/dcps.h wx/dialup.h wx/dirctrl.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/display.h wx/dnd.h wx/docmdi.h wx/docview.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/dragimag.h wx/effects.h wx/evtloop.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/fdrepdlg.h wx/fmappriv.h wx/font.h wx/fontdlg.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/fontenum.h wx/fontutil.h wx/gdiobj.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/geometry.h wx/gifdecod.h wx/glcanvas.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/grid.h wx/help.h wx/helpbase.h wx/helpwin.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/iconbndl.h wx/imagbmp.h wx/image.h wx/imaggif.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/imagiff.h wx/imagjpeg.h wx/imaglist.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/imagpcx.h wx/imagpng.h wx/imagpnm.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/imagtiff.h wx/imagxpm.h wx/joystick.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/laywin.h wx/listbase.h wx/listctrl.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/matrix.h wx/menuitem.h wx/metafile.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/minifram.h wx/notebook.h wx/ownerdrw.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/paper.h wx/popupwin.h wx/print.h wx/printdlg.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/splash.h wx/splitter.h wx/stack.h wx/statline.h \ -@COND_USE_GUI_1_WXUNIV_0@ wx/tab.h wx/tabctrl.h wx/taskbar.h wx/tbarbase.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/dcbuffer.h wx/dcmirror.h wx/dcps.h wx/dialup.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/dirctrl.h wx/display.h wx/dnd.h wx/docmdi.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/docview.h wx/dragimag.h wx/effects.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/evtloop.h wx/fdrepdlg.h wx/fmappriv.h wx/font.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/fontdlg.h wx/fontenum.h wx/fontutil.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/gdiobj.h wx/geometry.h wx/gifdecod.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/glcanvas.h wx/grid.h wx/help.h wx/helpbase.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/helpwin.h wx/iconbndl.h wx/imagbmp.h wx/image.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/imaggif.h wx/imagiff.h wx/imagjpeg.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/imaglist.h wx/imagpcx.h wx/imagpng.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/imagpnm.h wx/imagtiff.h wx/imagxpm.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/joystick.h wx/laywin.h wx/listbase.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/listctrl.h wx/matrix.h wx/menuitem.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/metafile.h wx/minifram.h wx/notebook.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/ownerdrw.h wx/paper.h wx/popupwin.h wx/print.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/printdlg.h wx/prntbase.h wx/progdlg.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/ptr_scpd.h wx/quantize.h wx/rawbmp.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/region.h wx/sashwin.h wx/scopeguard.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/spinbutt.h wx/spinctrl.h wx/splash.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/splitter.h wx/stack.h wx/statline.h wx/tab.h \ +@COND_USE_GUI_1_WXUNIV_0@ wx/tabctrl.h wx/taskbar.h wx/tbarbase.h \ @COND_USE_GUI_1_WXUNIV_0@ wx/tbarsmpl.h wx/tglbtn.h wx/tipdlg.h wx/tipwin.h \ @COND_USE_GUI_1_WXUNIV_0@ wx/tooltip.h wx/toplevel.h wx/treebase.h \ @COND_USE_GUI_1_WXUNIV_0@ wx/treectrl.h wx/valgen.h wx/vlbox.h \ @@ -228,26 +229,27 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_USE_GUI_1_WXUNIV_1@ wx/bitmap.h wx/busyinfo.h wx/calctrl.h wx/caret.h \ @COND_USE_GUI_1_WXUNIV_1@ wx/clipbrd.h wx/cmdproc.h wx/colordlg.h \ @COND_USE_GUI_1_WXUNIV_1@ wx/colour.h wx/cshelp.h wx/dataobj.h wx/dbgrid.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/dcbuffer.h wx/dcps.h wx/dialup.h wx/dirctrl.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/display.h wx/dnd.h wx/docmdi.h wx/docview.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/dragimag.h wx/effects.h wx/evtloop.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/fdrepdlg.h wx/fmappriv.h wx/font.h wx/fontdlg.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/fontenum.h wx/fontutil.h wx/gdiobj.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/geometry.h wx/gifdecod.h wx/glcanvas.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/grid.h wx/help.h wx/helpbase.h wx/helpwin.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/iconbndl.h wx/imagbmp.h wx/image.h wx/imaggif.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/imagiff.h wx/imagjpeg.h wx/imaglist.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/imagpcx.h wx/imagpng.h wx/imagpnm.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/imagtiff.h wx/imagxpm.h wx/joystick.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/laywin.h wx/listbase.h wx/listctrl.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/matrix.h wx/menuitem.h wx/metafile.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/minifram.h wx/notebook.h wx/ownerdrw.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/paper.h wx/popupwin.h wx/print.h wx/printdlg.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/prntbase.h wx/progdlg.h wx/ptr_scpd.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/quantize.h wx/rawbmp.h wx/region.h wx/sashwin.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/scopeguard.h wx/spinbutt.h wx/spinctrl.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/splash.h wx/splitter.h wx/stack.h wx/statline.h \ -@COND_USE_GUI_1_WXUNIV_1@ wx/tab.h wx/tabctrl.h wx/taskbar.h wx/tbarbase.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/dcbuffer.h wx/dcmirror.h wx/dcps.h wx/dialup.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/dirctrl.h wx/display.h wx/dnd.h wx/docmdi.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/docview.h wx/dragimag.h wx/effects.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/evtloop.h wx/fdrepdlg.h wx/fmappriv.h wx/font.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/fontdlg.h wx/fontenum.h wx/fontutil.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/gdiobj.h wx/geometry.h wx/gifdecod.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/glcanvas.h wx/grid.h wx/help.h wx/helpbase.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/helpwin.h wx/iconbndl.h wx/imagbmp.h wx/image.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/imaggif.h wx/imagiff.h wx/imagjpeg.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/imaglist.h wx/imagpcx.h wx/imagpng.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/imagpnm.h wx/imagtiff.h wx/imagxpm.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/joystick.h wx/laywin.h wx/listbase.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/listctrl.h wx/matrix.h wx/menuitem.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/metafile.h wx/minifram.h wx/notebook.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/ownerdrw.h wx/paper.h wx/popupwin.h wx/print.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/printdlg.h wx/prntbase.h wx/progdlg.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/ptr_scpd.h wx/quantize.h wx/rawbmp.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/region.h wx/sashwin.h wx/scopeguard.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/spinbutt.h wx/spinctrl.h wx/splash.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/splitter.h wx/stack.h wx/statline.h wx/tab.h \ +@COND_USE_GUI_1_WXUNIV_1@ wx/tabctrl.h wx/taskbar.h wx/tbarbase.h \ @COND_USE_GUI_1_WXUNIV_1@ wx/tbarsmpl.h wx/tglbtn.h wx/tipdlg.h wx/tipwin.h \ @COND_USE_GUI_1_WXUNIV_1@ wx/tooltip.h wx/toplevel.h wx/treebase.h \ @COND_USE_GUI_1_WXUNIV_1@ wx/treectrl.h wx/valgen.h wx/vlbox.h \ @@ -3584,9 +3586,6 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -3596,6 +3595,9 @@ coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -5722,9 +5724,6 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5734,6 +5733,9 @@ corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp @COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -8215,9 +8217,6 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -8227,6 +8226,9 @@ monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -10719,9 +10721,6 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_X11_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -10731,6 +10730,9 @@ monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp @COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 2c0e4b3f1a..37d175b92a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -500,6 +500,7 @@ wx/dataobj.h wx/dbgrid.h wx/dcbuffer.h + wx/dcmirror.h wx/dcps.h wx/dialup.h wx/dirctrl.h diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl index 66c69db7ed..06a65e942e 100644 --- a/contrib/build/gizmos/gizmos.bkl +++ b/contrib/build/gizmos/gizmos.bkl @@ -22,6 +22,7 @@ wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h + wx/gizmos/gizmos.h @@ -32,7 +33,7 @@ base core - + $(GIZMOS_SRC) diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc index 091e6254d9..3779779096 100644 --- a/contrib/build/gizmos/makefile.vc +++ b/contrib/build/gizmos/makefile.vc @@ -12,8 +12,8 @@ ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /Fp$(OBJS)\wxprec_gizmosdll.pch /I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS $(CXXFLAGS) /Yuwx/wxprec.h -GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /Fp$(OBJS)\wxprec_gizmoslib.pch /I..\..\src\gizmos\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h +GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /I..\..\src\gizmos\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_gizmosdll.pch /I..\..\src\gizmos\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_GIZMOS $(CXXFLAGS) /Yuwx/wxprec.h +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGFLAG_3) $(__DEBUGFLAG) /Fd..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.pdb $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\gizmos\..\..\..\include /I..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I..\..\src\gizmos\..\..\..\src\tiff /I..\..\src\gizmos\..\..\..\src\jpeg /I..\..\src\gizmos\..\..\..\src\png /I..\..\src\gizmos\..\..\..\src\zlib /I..\..\src\gizmos\..\..\..\src\regex /I..\..\src\gizmos\..\..\..\src\expat\lib /Fp$(OBJS)\wxprec_gizmoslib.pch /I..\..\src\gizmos\..\..\include $(CXXFLAGS) /Yuwx/wxprec.h OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) ### Conditionally set variables: ### @@ -158,7 +158,7 @@ clean: !if "$(SHARED)" == "1" ..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @<< - $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib + $(OBJS)\gizmosdll_dummy.obj $(OBJS)\gizmosdll_dynamicsash.obj $(OBJS)\gizmosdll_editlbox.obj $(OBJS)\gizmosdll_ledctrl.obj $(OBJS)\gizmosdll_multicell.obj $(OBJS)\gizmosdll_splittree.obj $(OBJS)\gizmosdll_statpict.obj $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:..\..\src\gizmos\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib << !endif diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 3fb8c9ccd2..01c9fa41a7 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net) +# Bakefile 0.1.1 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -43,12 +43,13 @@ top_srcdir = @top_srcdir@ GIZMOSDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ - -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) $(PIC_FLAG) + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) \ + $(PIC_FLAG) GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir)/../../include \ - $(CXXFLAGS) + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -I$(srcdir)/../../include $(CXXFLAGS) ### Conditionally set variables: ### @@ -69,12 +70,15 @@ GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib +@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ @COND_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @@ -160,7 +164,7 @@ distclean: clean rm -f bk-deps shared-ld-sh @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp @@ -206,7 +210,7 @@ gizmoslib_statpict.o: $(srcdir)/statpict.cpp install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) $(INSTALL_DIR) $(includedir) - for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h; do \ + for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \ if test ! -d $(includedir)/`dirname $$f` ; then \ $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ fi; \