Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10264] trunk
|
From: <ai...@us...> - 2009-08-16 01:24:43
|
Revision: 10264
http://plplot.svn.sourceforge.net/plplot/?rev=10264&view=rev
Author: airwin
Date: 2009-08-16 01:24:32 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
Drop the #defines of the PLD_* macros from config.h. Thus, from now on
use the configured plDevs.h header file exclusively to specify these macros.
Modified Paths:
--------------
trunk/config.h.cmake
trunk/drivers/cairo.c
trunk/examples/c++/CMakeLists.txt
trunk/include/qt.h
Modified: trunk/config.h.cmake
===================================================================
--- trunk/config.h.cmake 2009-08-15 19:22:07 UTC (rev 10263)
+++ trunk/config.h.cmake 2009-08-16 01:24:32 UTC (rev 10264)
@@ -185,180 +185,6 @@
/* Define if the win32 ltdl implementation should be used */
#cmakedefine LTDL_WIN32
-/* Define if aqt driver is present */
-#cmakedefine PLD_aqt
-
-/* Define if cgm driver is present */
-#cmakedefine PLD_cgm
-
-/* Define if conex driver is present */
-#cmakedefine PLD_conex
-
-/* Define if dg300 driver is present */
-#cmakedefine PLD_dg300
-
-/* Define if gcw driver is present */
-#cmakedefine PLD_gcw
-
-/* Define if gif driver is present */
-#cmakedefine PLD_gif
-
-/* Define if gnome driver is present */
-#cmakedefine PLD_gnome
-
-/* Define if hp7470 driver is present */
-#cmakedefine PLD_hp7470
-
-/* Define if hp7580 driver is present */
-#cmakedefine PLD_hp7580
-
-/* Define if imp driver is present */
-#cmakedefine PLD_imp
-
-/* Define if jpeg driver is present */
-#cmakedefine PLD_jpeg
-
-/* Define if linuxvga driver is present */
-#cmakedefine PLD_linuxvga
-
-/* Define if lj_hpgl driver is present */
-#cmakedefine PLD_lj_hpgl
-
-/* Define if ljii driver is present */
-#cmakedefine PLD_ljii
-
-/* Define if ljiip driver is present */
-#cmakedefine PLD_ljiip
-
-/* Define if mem driver is present */
-#cmakedefine PLD_mem
-
-/* Define if mskermit driver is present */
-#cmakedefine PLD_mskermit
-
-/* Define if ntk driver is present */
-#cmakedefine PLD_ntk
-
-/* Define if null driver is present */
-#cmakedefine PLD_null
-
-/* Define if pbm driver is present */
-#cmakedefine PLD_pbm
-
-/* Define if pdf driver is present */
-#cmakedefine PLD_pdf
-
-/* Define if plmeta driver is present */
-#cmakedefine PLD_plmeta
-
-/* Define if png driver is present */
-#cmakedefine PLD_png
-
-/* Define if ps driver is present */
-#cmakedefine PLD_ps
-
-/* Define if pstex driver is present */
-#cmakedefine PLD_pstex
-
-/* Define if psttf driver is present */
-#cmakedefine PLD_psttf
-
-/* Define if svg driver is present */
-#cmakedefine PLD_svg
-
-/* Define if tek4010 driver is present */
-#cmakedefine PLD_tek4010
-
-/* Define if tek4010f driver is present */
-#cmakedefine PLD_tek4010f
-
-/* Define if tek4107 driver is present */
-#cmakedefine PLD_tek4107
-
-/* Define if tek4107f driver is present */
-#cmakedefine PLD_tek4107f
-
-/* Define if tk driver is present */
-#cmakedefine PLD_tk
-
-/* Define if tkwin driver is present */
-#cmakedefine PLD_tkwin
-
-/* Define if versaterm driver is present */
-#cmakedefine PLD_versaterm
-
-/* Define if vlt driver is present */
-#cmakedefine PLD_vlt
-
-/* Define if wingcc driver is present */
-#cmakedefine PLD_wingcc
-
-/* Define if wxwidgets driver is present */
-#cmakedefine PLD_wxwidgets
-
-/* Define if wxwidgets png driver is present */
-#cmakedefine PLD_wxpng
-
-/* Define if xfig driver is present */
-#cmakedefine PLD_xfig
-
-/* Define if xterm driver is present */
-#cmakedefine PLD_xterm
-
-/* Define if xwin driver is present */
-#cmakedefine PLD_xwin
-
-/* Define if the Cairo external context driver is present */
-#cmakedefine PLD_extcairo
-
-/* Define if Cairo PDF driver is present */
-#cmakedefine PLD_pdfcairo
-
-/* Define if Cairo memory driver is present */
-#cmakedefine PLD_memcairo
-
-/* Define if Cairo PNG driver is present */
-#cmakedefine PLD_pngcairo
-
-/* Define if Cairo PS driver is present */
-#cmakedefine PLD_pscairo
-
-/* Define if Cairo SVG driver is present */
-#cmakedefine PLD_svgcairo
-
-/* Define if the cairo X windows driver is present */
-#cmakedefine PLD_xcairo
-
-/* Define if the EPS Qt driver is present */
-#cmakedefine PLD_epsqt
-
-/* Define if the PDF Qt driver is present */
-#cmakedefine PLD_pdfqt
-
-/* Define if Qt Widget driver is present */
-#cmakedefine PLD_qtwidget
-
-/* Define if SVG Qt driver is present */
-#cmakedefine PLD_svgqt
-
-/* Define if bmp Qt driver is present */
-#cmakedefine PLD_bmpqt
-
-/* Define if jpg Qt driver is present */
-#cmakedefine PLD_jpgqt
-
-/* Define if png Qt driver is present */
-#cmakedefine PLD_pngqt
-
-/* Define if ppm Qt driver is present */
-#cmakedefine PLD_ppmqt
-
-/* Define if tiff Qt driver is present */
-#cmakedefine PLD_tiffqt
-
-/* Define if external context Qt driver is present */
-#cmakedefine PLD_extqt
-
/* Portable definition for PTHREAD_MUTEX_RECURSIVE */
#define PLPLOT_MUTEX_RECURSIVE ${PLPLOT_MUTEX_RECURSIVE}
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2009-08-15 19:22:07 UTC (rev 10263)
+++ trunk/drivers/cairo.c 2009-08-16 01:24:32 UTC (rev 10264)
@@ -35,6 +35,7 @@
/* PLplot header files (must occur before driver-dependent includes) */
+#include "plDevs.h"
#include "plplotP.h"
#include "drivers.h"
Modified: trunk/examples/c++/CMakeLists.txt
===================================================================
--- trunk/examples/c++/CMakeLists.txt 2009-08-15 19:22:07 UTC (rev 10263)
+++ trunk/examples/c++/CMakeLists.txt 2009-08-16 01:24:32 UTC (rev 10264)
@@ -173,7 +173,6 @@
endif(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
endif(CORE_BUILD)
if(BUILD_qt_example)
- add_definitions(-DPLD_extqt)
qt4_wrap_cpp(
QT_MOC_OUTFILES
${CMAKE_CURRENT_SOURCE_DIR}/qt_PlotWindow.h
Modified: trunk/include/qt.h
===================================================================
--- trunk/include/qt.h 2009-08-15 19:22:07 UTC (rev 10263)
+++ trunk/include/qt.h 2009-08-16 01:24:32 UTC (rev 10264)
@@ -68,6 +68,7 @@
#include <QPicture>
#include <QMutex>
+#include "plDevs.h"
#include "plplotP.h"
#include "drivers.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
