[cairo-commit] boilerplate/Makefile.win32.features build/Makefile.win32.features build/Makefile.win32.features-h src/Makefile.win32.features

M. Joonas Pihlaja joonas at kemper.freedesktop.org
Mon Jul 12 00:40:44 PDT 2010


 boilerplate/Makefile.win32.features |    9 +++++++++
 build/Makefile.win32.features       |    1 +
 build/Makefile.win32.features-h     |    3 +++
 src/Makefile.win32.features         |    9 +++++++++
 4 files changed, 22 insertions(+)

New commits:
commit 0152db263b9b12547fadb5d080913fcbb696d34e
Author: M Joonas Pihlaja <jpihlaja at cc.helsinki.fi>
Date:   Mon Jul 12 10:36:00 2010 +0300

    build: Sync up autogenerated win32 build files.

diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
index 43e4c19..c2177da 100644
--- a/boilerplate/Makefile.win32.features
+++ b/boilerplate/Makefile.win32.features
@@ -452,6 +452,15 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
 enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_user_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
 
+all_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
+all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
+all_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
+ifeq ($(CAIRO_HAS_PTHREAD),1)
+enabled_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
+enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
+enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
+endif
+
 all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
 all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features
index 1d6fd8c..e80153f 100644
--- a/build/Makefile.win32.features
+++ b/build/Makefile.win32.features
@@ -33,6 +33,7 @@ CAIRO_HAS_PDF_SURFACE=1
 CAIRO_HAS_SVG_SURFACE=1
 CAIRO_HAS_TEST_SURFACES=0
 CAIRO_HAS_XML_SURFACE=1
+CAIRO_HAS_PTHREAD=0
 CAIRO_HAS_TRACE=0
 CAIRO_HAS_INTERPRETER=1
 CAIRO_HAS_SYMBOL_LOOKUP=0
diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h
index 9d9468c..16cca7f 100644
--- a/build/Makefile.win32.features-h
+++ b/build/Makefile.win32.features-h
@@ -108,6 +108,9 @@ ifeq ($(CAIRO_HAS_XML_SURFACE),1)
 	@echo "#define CAIRO_HAS_XML_SURFACE 1" >> src/cairo-features.h
 endif
 	@echo "#define CAIRO_HAS_USER_FONT 1" >> src/cairo-features.h
+ifeq ($(CAIRO_HAS_PTHREAD),1)
+	@echo "#define CAIRO_HAS_PTHREAD 1" >> src/cairo-features.h
+endif
 ifeq ($(CAIRO_HAS_TRACE),1)
 	@echo "#define CAIRO_HAS_TRACE 1" >> src/cairo-features.h
 endif
diff --git a/src/Makefile.win32.features b/src/Makefile.win32.features
index 260b6f7..8fe6af7 100644
--- a/src/Makefile.win32.features
+++ b/src/Makefile.win32.features
@@ -582,6 +582,15 @@ enabled_cairo_private += $(cairo_user_private)
 enabled_cairo_cxx_sources += $(cairo_user_cxx_sources)
 enabled_cairo_sources += $(cairo_user_sources)
 
+all_cairo_private += $(cairo_pthread_private) $(cairo_pthread_headers)
+all_cairo_cxx_sources += $(cairo_pthread_cxx_sources)
+all_cairo_sources += $(cairo_pthread_sources)
+ifeq ($(CAIRO_HAS_PTHREAD),1)
+enabled_cairo_private += $(cairo_pthread_private) $(cairo_pthread_headers)
+enabled_cairo_cxx_sources += $(cairo_pthread_cxx_sources)
+enabled_cairo_sources += $(cairo_pthread_sources)
+endif
+
 all_cairo_private += $(cairo_trace_private) $(cairo_trace_headers)
 all_cairo_cxx_sources += $(cairo_trace_cxx_sources)
 all_cairo_sources += $(cairo_trace_sources)


More information about the cairo-commit mailing list