X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a98fd8de061e3dfcbad732e44ee33017493672f..2dc357ea288152090ea36019a0279cdf9c4f6ef1:/Makefile.in diff --git a/Makefile.in b/Makefile.in index d21d45ec38..a03b1d32b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,6 +20,7 @@ DEREZ = @DEREZ@ DLLPREFIX = @DLLPREFIX@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_ODBC = @EXTRALIBS_ODBC@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ EXTRALIBS_XML = @EXTRALIBS_XML@ @@ -52,11 +53,10 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) \ - $(PIC_FLAG) +ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ advdll_calctrl.o \ advdll_dcbuffer.o \ @@ -70,10 +70,10 @@ ADVDLL_OBJECTS = \ advdll_tipdlg.o \ advdll_wizard.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_2) -ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) $(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) $(__INC_EXPAT_p) $(CXXFLAGS) +ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ advlib_calctrl.o \ advlib_dcbuffer.o \ @@ -109,6 +109,7 @@ ALL_BASE_HEADERS = \ wx/debug.h \ wx/defs.h \ wx/dir.h \ + wx/dlimpexp.h \ wx/dynarray.h \ wx/dynlib.h \ wx/dynload.h \ @@ -322,16 +323,16 @@ ALL_BASE_SOURCES = \ ALL_HEADERS = \ $(ALL_BASE_HEADERS) \ $(ALL_GUI_HEADERS) -BASEDLL_CFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASEDLL_CFLAGS = $(__basedll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CFLAGS) $(PIC_FLAG) -BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ basedll_appbase.o \ basedll_clntdata.o \ @@ -393,14 +394,15 @@ BASEDLL_OBJECTS = \ basedll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2) -BASELIB_CFLAGS = $(__baselib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS) -BASELIB_CXXFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +BASELIB_CFLAGS = $(__baselib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) \ + $(CXXFLAGS) BASELIB_OBJECTS = \ baselib_appbase.o \ baselib_clntdata.o \ @@ -462,16 +464,16 @@ BASELIB_OBJECTS = \ baselib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3) -COREDLL_CFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +COREDLL_CFLAGS = $(__coredll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG) -COREDLL_CXXFLAGS = $(__coredll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG) + -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ coredll_event.o \ coredll_fs_mem.o \ @@ -480,14 +482,14 @@ COREDLL_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \ $(__CORE_SRC_OBJECTS_2) -CORELIB_CFLAGS = $(__corelib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CFLAGS) -CORELIB_CXXFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +CORELIB_CFLAGS = $(__corelib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS) +CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ corelib_event.o \ corelib_fs_mem.o \ @@ -496,38 +498,37 @@ CORELIB_OBJECTS = \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) -DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) DBGRIDDLL_OBJECTS = \ dbgriddll_dbgrid.o -DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -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) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) DBGRIDLIB_OBJECTS = \ dbgridlib_dbgrid.o DESTDIR = -GLDLL_CXXFLAGS = $(__gldll_PCH_INC) $(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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) \ - $(PIC_FLAG) +GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(__OPENGL_SRC_OBJECTS) -GLLIB_CXXFLAGS = $(__gllib_PCH_INC) $(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) $(__INC_EXPAT_p) $(CXXFLAGS) +GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -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) $(__INC_EXPAT_p) \ + $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(__OPENGL_SRC_OBJECTS_1) -HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -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) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \ - $(CXXFLAGS) $(PIC_FLAG) + $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ htmldll_helpctrl.o \ @@ -551,10 +552,10 @@ HTMLDLL_OBJECTS = \ htmldll_m_tables.o \ htmldll_winpars.o \ htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -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) $(__INC_EXPAT_p) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ htmllib_helpctrl.o \ @@ -580,16 +581,15 @@ HTMLLIB_OBJECTS = \ htmllib_htmllbox.o LIBDIRNAME = $(top_builddir)lib LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW -MONODLL_CFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MONODLL_CFLAGS = $(__monodll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) +MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) \ - $(PIC_FLAG) -MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) \ - $(PIC_FLAG) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \ + $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ monodll_appbase.o \ monodll_clntdata.o \ @@ -665,14 +665,14 @@ MONODLL_OBJECTS = \ $(__MONOLIB_GUI_SRC_OBJECTS) \ monodll_xml.o \ monodll_xtixml.o -MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +MONOLIB_CFLAGS = $(__monolib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CFLAGS) -MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ monolib_appbase.o \ monolib_clntdata.o \ @@ -748,16 +748,16 @@ MONOLIB_OBJECTS = \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ monolib_xml.o \ monolib_xtixml.o -NETDLL_CFLAGS = $(__netdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG) -NETDLL_CXXFLAGS = $(__netdll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG) +NETDLL_CFLAGS = $(__netdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) NETDLL_OBJECTS = \ netdll_fs_inet.o \ netdll_ftp.o \ @@ -770,14 +770,14 @@ NETDLL_OBJECTS = \ netdll_socket.o \ netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) -NETLIB_CFLAGS = $(__netlib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CFLAGS) -NETLIB_CXXFLAGS = $(__netlib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) +NETLIB_CFLAGS = $(__netlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS) +NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ netlib_fs_inet.o \ netlib_ftp.o \ @@ -790,27 +790,27 @@ NETLIB_OBJECTS = \ netlib_socket.o \ netlib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_3) -ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) + -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) ODBCDLL_OBJECTS = \ odbcdll_db.o \ odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \ +ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) ODBCLIB_OBJECTS = \ odbclib_db.o \ odbclib_dbtable.o -WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) +WXEXPAT_CFLAGS = -I./src/expat $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ wxexpat_xmlparse.o \ wxexpat_xmlrole.o \ wxexpat_xmltok.o -WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXJPEG_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ wxjpeg_jcomapi.o \ wxjpeg_jutils.o \ @@ -858,7 +858,7 @@ WXJPEG_OBJECTS = \ wxjpeg_jquant1.o \ wxjpeg_jquant2.o \ wxjpeg_jdmerge.o -WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXODBC_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXODBC_OBJECTS = \ wxodbc_catalog.o \ wxodbc_connect.o \ @@ -875,7 +875,7 @@ WXODBC_OBJECTS = \ wxodbc_misc.o \ wxodbc_prepare.o \ wxodbc_result.o -WXPNG_CFLAGS = $(CPPFLAGS) $(__INC_ZLIB_p) $(CFLAGS) +WXPNG_CFLAGS = $(__INC_ZLIB_p) $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ wxpng_png.o \ wxpng_pngerror.o \ @@ -894,13 +894,13 @@ WXPNG_OBJECTS = \ wxpng_pngwrite.o \ wxpng_pngwtran.o \ wxpng_pngwutil.o -WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXREGEX_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ wxregex_regcomp.o \ wxregex_regexec.o \ wxregex_regerror.o \ wxregex_regfree.o -WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXTIFF_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXTIFF_OBJECTS = \ $(__TIFF_PLATFORM_SRC_OBJECTS) \ wxtiff_tif_aux.o \ @@ -935,7 +935,7 @@ WXTIFF_OBJECTS = \ wxtiff_tif_warning.o \ wxtiff_tif_write.o \ wxtiff_tif_zip.o -WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) +WXZLIB_CFLAGS = $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ wxzlib_adler32.o \ wxzlib_compress.o \ @@ -952,18 +952,18 @@ WXZLIB_OBJECTS = \ wxzlib_infutil.o \ wxzlib_inffast.o WX_VERSION = 2.5.1 -XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \ - -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG) +XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) XMLDLL_OBJECTS = \ xmldll_xml.o \ xmldll_xtixml.o -XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(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) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS) +XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -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) $(__INC_EXPAT_p) \ + -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ xmllib_xml.o \ xmllib_xtixml.o @@ -1007,6 +1007,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/filedlg.h \ wx/frame.h \ wx/gauge.h \ + wx/gbsizer.h \ wx/gdicmn.h \ wx/generic/accel.h \ wx/generic/choicdgg.h \ @@ -1530,6 +1531,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR = \ wx/motif/minifram.h \ wx/motif/msgdlg.h \ wx/motif/palette.h \ + wx/motif/popupwin.h \ wx/motif/print.h \ wx/motif/private.h \ wx/motif/radiobox.h \ @@ -1684,6 +1686,7 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/generic/colrdlgg.h \ wx/generic/dirdlgg.h \ wx/generic/fdrepdlg.h \ + wx/generic/listctrl.h \ wx/generic/mdig.h \ wx/generic/statusbr.h \ wx/os2/accel.h \ @@ -1721,7 +1724,6 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/icon.h \ wx/os2/iniconf.h \ wx/os2/listbox.h \ - wx/os2/listctrl.h \ wx/os2/menu.h \ wx/os2/menuitem.h \ wx/os2/metafile.h \ @@ -1753,7 +1755,6 @@ COND_TOOLKIT_PM_GUI_HDR = \ wx/os2/toolbar.h \ wx/os2/tooltip.h \ wx/os2/toplevel.h \ - wx/msw/treectrl.h \ wx/os2/window.h @COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR) @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = @@ -1761,6 +1762,7 @@ COND_TOOLKIT_GTK_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ + wx/unix/displayx11.h \ wx/generic/paletteg.h @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR) @COND_TOOLKIT_MAC@LOWLEVEL_HDR = @@ -1793,6 +1795,7 @@ COND_TOOLKIT_MOTIF_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ + wx/unix/displayx11.h \ wx/x11/bitmap.h \ wx/x11/brush.h \ wx/x11/pen.h \ @@ -1804,6 +1807,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR = \ wx/generic/caret.h \ wx/unix/fontutil.h \ wx/unix/utilsx11.h \ + wx/unix/displayx11.h \ wx/x11/app.h \ wx/x11/bitmap.h \ wx/x11/brush.h \ @@ -2232,6 +2236,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_fontmap.o \ monodll_framecmn.o \ monodll_gaugecmn.o \ + monodll_gbsizer.o \ monodll_gdicmn.o \ monodll_geometry.o \ monodll_gifdecod.o \ @@ -2377,6 +2382,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_fontmap.o \ monodll_framecmn.o \ monodll_gaugecmn.o \ + monodll_gbsizer.o \ monodll_gdicmn.o \ monodll_geometry.o \ monodll_gifdecod.o \ @@ -2474,6 +2480,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_fontmap.o \ monolib_framecmn.o \ monolib_gaugecmn.o \ + monolib_gbsizer.o \ monolib_gdicmn.o \ monolib_geometry.o \ monolib_gifdecod.o \ @@ -2619,6 +2626,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_fontmap.o \ monolib_framecmn.o \ monolib_gaugecmn.o \ + monolib_gbsizer.o \ monolib_gdicmn.o \ monolib_geometry.o \ monolib_gifdecod.o \ @@ -2716,6 +2724,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_fontmap.o \ coredll_framecmn.o \ coredll_gaugecmn.o \ + coredll_gbsizer.o \ coredll_gdicmn.o \ coredll_geometry.o \ coredll_gifdecod.o \ @@ -2861,6 +2870,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_fontmap.o \ coredll_framecmn.o \ coredll_gaugecmn.o \ + coredll_gbsizer.o \ coredll_gdicmn.o \ coredll_geometry.o \ coredll_gifdecod.o \ @@ -2958,6 +2968,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_fontmap.o \ corelib_framecmn.o \ corelib_gaugecmn.o \ + corelib_gbsizer.o \ corelib_gdicmn.o \ corelib_geometry.o \ corelib_gifdecod.o \ @@ -3103,6 +3114,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_fontmap.o \ corelib_framecmn.o \ corelib_gaugecmn.o \ + corelib_gbsizer.o \ corelib_gdicmn.o \ corelib_geometry.o \ corelib_gifdecod.o \ @@ -3197,6 +3209,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_dcmemory.o \ monodll_dcscreen.o \ monodll_dialog.o \ + monodll_evtloop.o \ monodll_font.o \ monodll_fontenum.o \ monodll_fontutil.o \ @@ -3403,6 +3416,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_minifram.o \ monodll_msgdlg.o \ monodll_palette.o \ + monodll_popupwin.o \ monodll_radiobox.o \ monodll_radiobut.o \ monodll_scrolbar.o \ @@ -3486,6 +3500,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_imaglist.o \ + monodll_listctrl.o \ monodll_mdig.o \ monodll_msgdlgg.o \ monodll_prntdlgg.o \ @@ -3528,7 +3543,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_icon.o \ monodll_iniconf.o \ monodll_listbox.o \ - monodll_listctrl.o \ monodll_main.o \ monodll_menu.o \ monodll_menuitem.o \ @@ -3558,7 +3572,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \ monodll_toolbar.o \ monodll_tooltip.o \ monodll_toplevel.o \ - monodll_treectrl.o \ monodll_utilsgui.o \ monodll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS) @@ -3592,6 +3605,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_dcmemory.o \ monolib_dcscreen.o \ monolib_dialog.o \ + monolib_evtloop.o \ monolib_font.o \ monolib_fontenum.o \ monolib_fontutil.o \ @@ -3798,6 +3812,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_minifram.o \ monolib_msgdlg.o \ monolib_palette.o \ + monolib_popupwin.o \ monolib_radiobox.o \ monolib_radiobut.o \ monolib_scrolbar.o \ @@ -3881,6 +3896,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_imaglist.o \ + monolib_listctrl.o \ monolib_mdig.o \ monolib_msgdlgg.o \ monolib_prntdlgg.o \ @@ -3923,7 +3939,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_icon.o \ monolib_iniconf.o \ monolib_listbox.o \ - monolib_listctrl.o \ monolib_main.o \ monolib_menu.o \ monolib_menuitem.o \ @@ -3953,7 +3968,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \ monolib_toolbar.o \ monolib_tooltip.o \ monolib_toplevel.o \ - monolib_treectrl.o \ monolib_utilsgui.o \ monolib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1) @@ -3987,6 +4001,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_dcmemory.o \ coredll_dcscreen.o \ coredll_dialog.o \ + coredll_evtloop.o \ coredll_font.o \ coredll_fontenum.o \ coredll_fontutil.o \ @@ -4193,6 +4208,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_minifram.o \ coredll_msgdlg.o \ coredll_palette.o \ + coredll_popupwin.o \ coredll_radiobox.o \ coredll_radiobut.o \ coredll_scrolbar.o \ @@ -4276,6 +4292,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_imaglist.o \ + coredll_listctrl.o \ coredll_mdig.o \ coredll_msgdlgg.o \ coredll_prntdlgg.o \ @@ -4318,7 +4335,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_icon.o \ coredll_iniconf.o \ coredll_listbox.o \ - coredll_listctrl.o \ coredll_main.o \ coredll_menu.o \ coredll_menuitem.o \ @@ -4348,7 +4364,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 = \ coredll_toolbar.o \ coredll_tooltip.o \ coredll_toplevel.o \ - coredll_treectrl.o \ coredll_utilsgui.o \ coredll_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2) @@ -4382,6 +4397,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_dcmemory.o \ corelib_dcscreen.o \ corelib_dialog.o \ + corelib_evtloop.o \ corelib_font.o \ corelib_fontenum.o \ corelib_fontutil.o \ @@ -4588,6 +4604,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_minifram.o \ corelib_msgdlg.o \ corelib_palette.o \ + corelib_popupwin.o \ corelib_radiobox.o \ corelib_radiobut.o \ corelib_scrolbar.o \ @@ -4671,6 +4688,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_imaglist.o \ + corelib_listctrl.o \ corelib_mdig.o \ corelib_msgdlgg.o \ corelib_prntdlgg.o \ @@ -4713,7 +4731,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_icon.o \ corelib_iniconf.o \ corelib_listbox.o \ - corelib_listctrl.o \ corelib_main.o \ corelib_menu.o \ corelib_menuitem.o \ @@ -4743,13 +4760,20 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 = \ corelib_toolbar.o \ corelib_tooltip.o \ corelib_toplevel.o \ - corelib_treectrl.o \ corelib_utilsgui.o \ corelib_window.o @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3) +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o +@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o +@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o @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 @@ -4782,6 +4806,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS = \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_paletteg.o \ monodll_app.o \ monodll_bitmap.o \ @@ -4851,6 +4876,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_bitmap.o \ monodll_brush.o \ monodll_pen.o \ @@ -4915,6 +4941,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_fontenum.o \ monodll_fontutil.o \ monodll_utilsx11.o \ + monodll_displayx11.o \ monodll_timer.o \ monodll_app.o \ monodll_bitmap.o \ @@ -4954,6 +4981,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_paletteg.o \ monolib_app.o \ monolib_bitmap.o \ @@ -5023,6 +5051,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_bitmap.o \ monolib_brush.o \ monolib_pen.o \ @@ -5087,6 +5116,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 = \ monolib_fontenum.o \ monolib_fontutil.o \ monolib_utilsx11.o \ + monolib_displayx11.o \ monolib_timer.o \ monolib_app.o \ monolib_bitmap.o \ @@ -5126,6 +5156,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_paletteg.o \ coredll_app.o \ coredll_bitmap.o \ @@ -5195,6 +5226,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_bitmap.o \ coredll_brush.o \ coredll_pen.o \ @@ -5259,6 +5291,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 = \ coredll_fontenum.o \ coredll_fontutil.o \ coredll_utilsx11.o \ + coredll_displayx11.o \ coredll_timer.o \ coredll_app.o \ coredll_bitmap.o \ @@ -5298,6 +5331,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_paletteg.o \ corelib_app.o \ corelib_bitmap.o \ @@ -5367,6 +5401,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_bitmap.o \ corelib_brush.o \ corelib_pen.o \ @@ -5431,6 +5466,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \ corelib_fontenum.o \ corelib_fontutil.o \ corelib_utilsx11.o \ + corelib_displayx11.o \ corelib_timer.o \ corelib_app.o \ corelib_bitmap.o \ @@ -5588,6 +5624,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ @COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o +@COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = \ @@ -7727,6 +7764,15 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7781,6 +7827,9 @@ coredll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -7997,6 +8046,9 @@ coredll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@coredll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_USE_GUI_1@coredll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1@coredll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8192,9 +8244,6 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8210,6 +8259,9 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8474,6 +8526,9 @@ coredll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9005,11 +9060,8 @@ coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_uma.o: $(srcdir)/src/mac/uma.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9817,6 +9869,15 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -9871,6 +9932,9 @@ corelib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10087,6 +10151,9 @@ corelib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@corelib_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_USE_GUI_1@corelib_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1@corelib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10282,9 +10349,6 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10300,6 +10364,9 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10564,6 +10631,9 @@ corelib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11095,11 +11165,8 @@ corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_uma.o: $(srcdir)/src/mac/uma.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -11290,10 +11357,16 @@ distclean: clean @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $< @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP) $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_HTML) @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(__htmldll___so_symlinks_cmd) +@COND_PLATFORM_UNIX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< + htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< @@ -11365,6 +11438,12 @@ htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(AR) rcu $@ $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(RANLIB) $@ +@COND_PLATFORM_UNIX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< + htmllib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< @@ -11631,7 +11710,7 @@ locale_install: @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir) @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__monodll_PCH_DEP) $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) -@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) @COND_MONOLITHIC_1_SHARED_1@ @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd) @@ -11920,6 +11999,12 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12391,6 +12476,15 @@ monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12457,6 +12551,9 @@ monodll_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12706,6 +12803,9 @@ monodll_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monodll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_USE_GUI_1@monodll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13009,9 +13109,6 @@ monodll_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13027,6 +13124,9 @@ monodll_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13363,6 +13463,9 @@ monodll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14011,11 +14114,8 @@ monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -14505,6 +14605,12 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_UNIX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14976,6 +15082,15 @@ monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_GTK_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + +@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp +@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15042,6 +15157,9 @@ monolib_event.o: $(srcdir)/src/common/event.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15291,6 +15409,9 @@ monolib_gauge95.o: $(srcdir)/src/msw/gauge95.cpp @COND_USE_GUI_1@monolib_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_USE_GUI_1@monolib_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1@monolib_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15594,9 +15715,6 @@ monolib_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/mac/listbox.cpp @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15612,6 +15730,9 @@ monolib_list.o: $(srcdir)/src/common/list.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_USE_GUI_1_WXUNIV_1@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp @COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15948,6 +16069,9 @@ monolib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp @COND_TOOLKIT_MSW_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp +@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_print.o: $(srcdir)/src/os2/print.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16596,11 +16720,8 @@ monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp -@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -17308,6 +17429,9 @@ wxtiff_tif_tile.o: $(srcdir)/src/tiff/tif_tile.c @COND_PLATFORM_MACOSX_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c @COND_PLATFORM_MACOSX_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< +@COND_PLATFORM_OS2_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c +@COND_PLATFORM_OS2_1@ $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $< + wxtiff_tif_version.o: $(srcdir)/src/tiff/tif_version.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<