diff options
| author | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
| commit | da1320efe152132d088042ae8857571113fad5e3 (patch) | |
| tree | 1c98d8a24f20dbdb8a7c1c88c89d6bc4cb0ba6db /cairo | |
| parent | 33474c4fff35faaedbd93461acb24496160f820f (diff) | |
| parent | d66343ab594fac375f4e3fc939594e9ebe5d4963 (diff) | |
sb126: merged in DEV300_m84
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 4 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 564c5dd9995a..a5ddbc6af935 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -70,11 +70,9 @@ cairo_CPPFLAGS+=$(INCLUDE) .IF "$(OS)"=="WNT" # --------- Windows ------------------------------------------------- .IF "$(COM)"=="GCC" -cairo_CFLAGS+=-D_MT cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/) cairo_CPPFLAGS+=-nostdinc -cairo_CC=$(CC) -cairo_LIBS+=-lmingwthrd +cairo_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" cairo_CC+=-shared-libgcc diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 4f8e5ca715aa..b94e7673d996 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -62,7 +62,7 @@ PATCH_FILES=..$/$(TARFILE_NAME).patch .IF "$(COM)"=="GCC" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -D_MT" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -mthreads" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |