|
1220
|
1 This file is part of mingw-cross-env. |
|
|
2 See doc/index.html for further information. |
|
|
3 |
|
|
4 Contains ad hoc patches for cross building. |
|
|
5 |
|
|
6 From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 |
|
|
7 From: mingw-cross-env |
|
|
8 Date: Fri, 24 Sep 2010 23:34:26 +0200 |
|
|
9 Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain, |
|
|
10 |
|
|
11 |
|
|
12 diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c |
|
|
13 index d7a7247..cc52d99 100644 |
|
|
14 --- a/gsf/gsf-utils.c |
|
|
15 +++ b/gsf/gsf-utils.c |
|
|
16 @@ -119,9 +119,9 @@ static GTypeModule *static_type_module = NULL; |
|
|
17 #include <windows.h> |
|
|
18 static HMODULE gsf_dll_hmodule; |
|
|
19 BOOL WINAPI |
|
|
20 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); |
|
|
21 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); |
|
|
22 BOOL WINAPI |
|
|
23 -DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) |
|
|
24 +static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved) |
|
|
25 { |
|
|
26 if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL; |
|
|
27 return TRUE; |
|
|
28 -- |
|
|
29 1.7.1 |
|
|
30 |
|
|
31 |
|
|
32 From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001 |
|
|
33 From: mingw-cross-env |
|
|
34 Date: Wed, 29 Sep 2010 20:15:48 +0200 |
|
|
35 Subject: [PATCH 2/2] no gettext |
|
|
36 |
|
|
37 |
|
|
38 diff --git a/configure.in b/configure.in |
|
|
39 index af40c28..7ce5f7b 100644 |
|
|
40 --- a/configure.in |
|
|
41 +++ b/configure.in |
|
|
42 @@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
|
|
43 |
|
|
44 dnl Gettext/i18n stuff |
|
|
45 |
|
|
46 -IT_PROG_INTLTOOL([0.35.0]) |
|
|
47 - |
|
|
48 -AM_GLIB_GNU_GETTEXT |
|
|
49 - |
|
|
50 GETTEXT_PACKAGE=AC_PACKAGE_NAME |
|
|
51 AC_SUBST(GETTEXT_PACKAGE) |
|
|
52 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) |
|
|
53 -- |
|
|
54 1.7.1 |
|
|
55 |
