From 0152db263b9b12547fadb5d080913fcbb696d34e Mon Sep 17 00:00:00 2001 From: M Joonas Pihlaja Date: Mon, 12 Jul 2010 10:36:00 +0300 Subject: [PATCH] build: Sync up autogenerated win32 build files. --- 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(+) diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 43e4c1918..c2177da7b 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 1d6fd8cbc..e80153f0c 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 9d9468cd0..16cca7f1f 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 260b6f7c9..8fe6af74d 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)