You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
2.8 KiB
88 lines
2.8 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Fri, 24 Sep 2010 23:31:24 +0200
|
|
Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain,
|
|
|
|
|
|
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
|
|
index 1111111..2222222 100644
|
|
--- a/gdk-pixbuf/gdk-pixbuf-io.c
|
|
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
|
|
@@ -193,12 +193,12 @@ get_file_formats (void)
|
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
-/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */
|
|
+/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */
|
|
|
|
static HMODULE gdk_pixbuf_dll;
|
|
|
|
BOOL WINAPI
|
|
-DllMain (HINSTANCE hinstDLL,
|
|
+gdkpixbuf_DllMain (HINSTANCE hinstDLL,
|
|
DWORD fdwReason,
|
|
LPVOID lpvReserved)
|
|
{
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Fri, 12 Oct 2012 12:24:51 +0200
|
|
Subject: [PATCH 2/3] add libtiff to required.private in .pc
|
|
|
|
|
|
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
|
|
index 1111111..2222222 100644
|
|
--- a/gdk-pixbuf-2.0.pc.in
|
|
+++ b/gdk-pixbuf-2.0.pc.in
|
|
@@ -12,7 +12,7 @@ Name: GdkPixbuf
|
|
Description: Image loading and scaling
|
|
Version: @VERSION@
|
|
Requires: gobject-2.0
|
|
-Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
|
|
+Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ libtiff-4
|
|
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@
|
|
Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
|
|
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Fri, 12 Oct 2012 12:25:27 +0200
|
|
Subject: [PATCH 3/3] allow static
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1111111..2222222 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -136,16 +136,16 @@ case $host in
|
|
;;
|
|
esac
|
|
|
|
-if test "$os_win32" = "yes"; then
|
|
- if test x$enable_static = xyes -o x$enable_static = x; then
|
|
- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
|
- enable_static=no
|
|
- fi
|
|
- if test x$enable_shared = xno; then
|
|
- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
|
- fi
|
|
- enable_shared=yes
|
|
-fi
|
|
+dnl if test "$os_win32" = "yes"; then
|
|
+dnl if test x$enable_static = xyes -o x$enable_static = x; then
|
|
+dnl AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
|
+dnl enable_static=no
|
|
+dnl fi
|
|
+dnl if test x$enable_shared = xno; then
|
|
+dnl AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
|
+dnl fi
|
|
+dnl enable_shared=yes
|
|
+dnl fi
|
|
|
|
dnl Initialize libtool
|
|
LT_PREREQ([2.2.6])
|