From afb95ead481c8ced5fdbb09affd6f72067723e94 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 11 Aug 2008 15:27:40 +0200 Subject: 2008-08-09 Armin Burgmeier * MSVC_Net2005/cairomm/cairomm.rc.in: Removed #include resource.h since there is no resource.h, and it works well without that include. * MSVC_Net2005/cairomm/Makefile.am: Copy cairommconfig.h from cairomm/, so it is available to the visual studio project. * MSVC_Net2005/cairomm/cairomm.vcproj: Added cairomm/context_surface_win32.cc to the project. * Makefile.am: * configure.in: Adapt build files. --- ChangeLog | 24 ++ MSVC_Net2005/README | 2 +- MSVC_Net2005/cairomm/Makefile.am | 11 +- MSVC_Net2005/cairomm/cairomm.rc.in | 1 - MSVC_Net2005/cairomm/cairomm.vcproj | 640 +++++++++++++++++++----------------- Makefile.am | 2 +- cairomm/context_surface_xlib.cc | 2 +- configure.in | 20 +- 8 files changed, 376 insertions(+), 326 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73bcb7b..64a83b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2008-08-09 Armin Burgmeier + + * MSVC_Net2005/cairomm/cairomm.rc.in: Removed #include "resource.h" + since there is no resource.h, and it works well without that include. + + * MSVC_Net2005/cairomm/Makefile.am: Copy cairommconfig.h from + cairomm/, so it is available to the visual studio project. + + * MSVC_Net2005/cairomm/cairomm.vcproj: Added + cairomm/context_surface_win32.cc to the project. + + * Makefile.am: + * configure.in: Adapt build files. + +2008-08-09 Armin Burgmeier + + * cairomm/context_surface_xlib.cc: Check for CAIRO_HAS_XLIB_SURFACE + instead of CAIRO_HAS_WIN32_SURFACE. + +2008-08-07 Murray Cumming + + * MSVC/: Renamed to MSVC_Net2008, ready to be patched by Armin + or Cedric. + 2008-04-25 Jonathon Jongsma * cairomm/context.h: removed extra unused function declarations diff --git a/MSVC_Net2005/README b/MSVC_Net2005/README index 81886cd..f347d15 100644 --- a/MSVC_Net2005/README +++ b/MSVC_Net2005/README @@ -3,7 +3,7 @@ Building cairomm-1.0 with Visual Studio .NET 2005 * You will need Visual Studio .NET 2005 (MSVC 8.0). Earlier versions of the compiler, including 6.0 and 7.0 might also work but have not been tested. * Install the latest Win32 GTK+ Development Environment from the Glade for Windows project, http://gladewin32.sourceforge.net. * Add libsigc++ to the include and lib paths in Visual Studio. -* Load the cairomm/MSVC3/cairomm.sln solution. +* Load the cairomm/MSVC_Net2005/cairomm.sln solution. * Build the entire solution. * Run the tests. diff --git a/MSVC_Net2005/cairomm/Makefile.am b/MSVC_Net2005/cairomm/Makefile.am index b0c0ced..2b6fcdb 100644 --- a/MSVC_Net2005/cairomm/Makefile.am +++ b/MSVC_Net2005/cairomm/Makefile.am @@ -1,5 +1,12 @@ -BUILT_SOURCES = cairomm.rc +BUILT_SOURCES = cairommconfig.h cairomm.rc MAINTAINERCLEANFILES = $(built_sources) -EXTRA_DIST = cairomm.vcproj cairomm.rc +EXTRA_DIST = cairommconfig.h cairomm.vcproj cairomm.rc + +# Copy config file generated by the configure script. Dependency is +# wht respect to the .h.in file, to prevent an error with 'make distcheck'. +# See http://sources.redhat.com/automake/automake.html#distcleancheck + +cairommconfig.h: $(top_srcdir)/cairomm/cairommconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/cairomm/cairommconfig.h $@ diff --git a/MSVC_Net2005/cairomm/cairomm.rc.in b/MSVC_Net2005/cairomm/cairomm.rc.in index 8c968cf..537237f 100644 --- a/MSVC_Net2005/cairomm/cairomm.rc.in +++ b/MSVC_Net2005/cairomm/cairomm.rc.in @@ -1,4 +1,3 @@ -#include "resource.h" #define APSTUDIO_READONLY_SYMBOLS diff --git a/MSVC_Net2005/cairomm/cairomm.vcproj b/MSVC_Net2005/cairomm/cairomm.vcproj index ff0136d..ab9b9c6 100644 --- a/MSVC_Net2005/cairomm/cairomm.vcproj +++ b/MSVC_Net2005/cairomm/cairomm.vcproj @@ -1,310 +1,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Makefile.am b/Makefile.am index 8d5ce0e..6223f8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) tests +SUBDIRS = cairomm examples MSVC_Net2005 $(DOCS_SUBDIR) tests #docs examples ACLOCAL_AMFLAGS = -I m4 diff --git a/cairomm/context_surface_xlib.cc b/cairomm/context_surface_xlib.cc index 0f57bc7..dfb0872 100644 --- a/cairomm/context_surface_xlib.cc +++ b/cairomm/context_surface_xlib.cc @@ -28,7 +28,7 @@ namespace Private RefPtr wrap_surface_xlib(cairo_surface_t* surface) { -#if CAIRO_HAS_WIN32_SURFACE +#if CAIRO_HAS_XLIB_SURFACE return RefPtr(new XlibSurface(surface, false /* does not have reference */)); #else return RefPtr(new Surface(surface, false /* does not have reference */)); diff --git a/configure.in b/configure.in index 315cf98..55c7b82 100644 --- a/configure.in +++ b/configure.in @@ -184,16 +184,16 @@ AC_CONFIG_FILES( ) AC_CONFIG_FILES([ - MSVC/Makefile - MSVC/gendef/Makefile - MSVC/cairomm/Makefile - MSVC/cairomm/cairomm.rc - MSVC/examples/Makefile - MSVC/examples/pdf-surface/Makefile - MSVC/examples/png_file/Makefile - MSVC/examples/ps-surface/Makefile - MSVC/examples/svg-surface/Makefile - MSVC/examples/text-rotate/Makefile + MSVC_Net2005/Makefile + MSVC_Net2005/gendef/Makefile + MSVC_Net2005/cairomm/Makefile + MSVC_Net2005/cairomm/cairomm.rc + MSVC_Net2005/examples/Makefile + MSVC_Net2005/examples/pdf-surface/Makefile + MSVC_Net2005/examples/png_file/Makefile + MSVC_Net2005/examples/ps-surface/Makefile + MSVC_Net2005/examples/svg-surface/Makefile + MSVC_Net2005/examples/text-rotate/Makefile ]) AC_OUTPUT() -- cgit v1.2.3