From: Robert Roebling Date: Thu, 6 Sep 2007 17:31:51 +0000 (+0000) Subject: Add Cairo to build, remove run-time dependency X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fd220f13d45c983089db895af7b4be15cd72de50 Add Cairo to build, remove run-time dependency git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index c249f0ce67..f13172159d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3108,6 +3108,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/bmpbuttn.h \ wx/brush.h \ wx/button.h \ + wx/cairo.h \ wx/checkbox.h \ wx/checklst.h \ wx/choicdlg.h \ @@ -3779,6 +3780,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_bmpbase.o \ monodll_bookctrl.o \ monodll_btncmn.o \ + monodll_cairo.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ @@ -3957,6 +3959,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_bmpbase.o \ monodll_bookctrl.o \ monodll_btncmn.o \ + monodll_cairo.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ monodll_clrpickercmn.o \ @@ -5625,6 +5628,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_bmpbase.o \ monolib_bookctrl.o \ monolib_btncmn.o \ + monolib_cairo.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ @@ -5803,6 +5807,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_bmpbase.o \ monolib_bookctrl.o \ monolib_btncmn.o \ + monolib_cairo.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ monolib_clrpickercmn.o \ @@ -7746,6 +7751,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_bmpbase.o \ coredll_bookctrl.o \ coredll_btncmn.o \ + coredll_cairo.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ @@ -7924,6 +7930,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_bmpbase.o \ coredll_bookctrl.o \ coredll_btncmn.o \ + coredll_cairo.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ coredll_clrpickercmn.o \ @@ -9203,6 +9210,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_bmpbase.o \ corelib_bookctrl.o \ corelib_btncmn.o \ + corelib_cairo.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ @@ -9381,6 +9389,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_bmpbase.o \ corelib_bookctrl.o \ corelib_btncmn.o \ + corelib_cairo.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ corelib_clrpickercmn.o \ @@ -17227,6 +17236,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp +@COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp + @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -21562,6 +21574,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp +@COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp + @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -26407,6 +26422,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp +@COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp + @COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp @@ -29368,6 +29386,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp +@COND_USE_GUI_1@corelib_cairo.o: $(srcdir)/src/common/cairo.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp + @COND_USE_GUI_1@corelib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 8325476eff..8df9b50d5d 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -618,6 +618,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/bmpbase.cpp src/common/bookctrl.cpp src/common/btncmn.cpp + src/common/cairo.cpp src/common/choiccmn.cpp src/common/clipcmn.cpp src/common/clrpickercmn.cpp @@ -738,6 +739,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/bmpbuttn.h wx/brush.h wx/button.h + wx/cairo.h wx/checkbox.h wx/checklst.h wx/choicdlg.h diff --git a/configure b/configure index 1eb55f1468..b9d6e69580 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 48336 2007-08-22 15:11:12Z VS . +# From configure.in Id: configure.in 48569 2007-09-05 18:55:18Z RR . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0. # @@ -49610,7 +49610,8 @@ EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_GTKPRINT` +# EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_GTKPRINT` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" diff --git a/configure.in b/configure.in index 119d891b6b..7b7dcbe574 100644 --- a/configure.in +++ b/configure.in @@ -7442,7 +7442,7 @@ EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_GTKPRINT` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" diff --git a/setup.h_vms b/setup.h_vms index 85aa3d107e..73cf1666cd 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -689,6 +689,10 @@ typedef pid_t GPid; * Use SDL for audio (Unix) */ #define wxUSE_LIBSDL 0 +/* + * Use GTK print for printing under GTK+ 2.0 + */ +#define wxUSE_GTKPRINT 0 /* * Use GNOME print for printing under GTK+ 2.0 */