summaryrefslogtreecommitdiffstats
path: root/src/libaacs-1.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2015-03-29 12:57:28 (GMT)
committerMark Brand <mabrand@mabrand.nl>2015-03-29 13:04:53 (GMT)
commit182394008e63b1a977b5f6edd3d8c129fe2dce34 (patch)
tree29d567445faa120cd96b3bfe2967f75b1e7c75da /src/libaacs-1.patch
parenta8df43d1324294522bde66f2c5d5f9f6d43476e6 (diff)
downloadmxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.zip
mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.gz
mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.bz2
mingw-w64: fix the shlobj.h problem at the source
Diffstat (limited to 'src/libaacs-1.patch')
-rw-r--r--src/libaacs-1.patch27
1 files changed, 2 insertions, 25 deletions
diff --git a/src/libaacs-1.patch b/src/libaacs-1.patch
index 624a242..985fdce 100644
--- a/src/libaacs-1.patch
+++ b/src/libaacs-1.patch
@@ -4,7 +4,7 @@ See index.html for further information.
From 5ebe4419738fd337f5c2f8e2849dd8e7c1f55d01 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 28 Mar 2015 21:06:26 +0100
-Subject: [PATCH 1/3] fix configure
+Subject: [PATCH 1/2] fix configure
diff --git a/configure.ac b/configure.ac
@@ -36,7 +36,7 @@ index 155acad..8cb7e79 100644
From c807305d0df68e88aa04fabd3275aff4f34d4368 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 28 Mar 2015 21:06:56 +0100
-Subject: [PATCH 2/3] fix pkgconfig
+Subject: [PATCH 2/2] fix pkgconfig
diff --git a/src/libaacs.pc.in b/src/libaacs.pc.in
@@ -53,26 +53,3 @@ index 598f206..4334d8c 100644
2.1.0
-From 638bb17ec1daf447def2706896e209dd22adb8ca Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 28 Mar 2015 21:03:45 +0100
-Subject: [PATCH 3/3] fix include order
-
-
-diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c
-index 0e1208a..a037f8d 100644
---- a/src/file/dirs_win32.c
-+++ b/src/file/dirs_win32.c
-@@ -28,8 +28,8 @@
- #include <stdio.h>
- #include <string.h>
-
--#include <shlobj.h>
- #include <windows.h>
-+#include <shlobj.h>
- #include <limits.h>
- #include <direct.h>
-
---
-2.1.0
-