Mercurial > mxe-octave

annotate src/msvc-glib-1.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 2733829a184e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3132
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur glib-2.36.3-orig/Makefile.in glib-2.36.3/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- glib-2.36.3-orig/Makefile.in 2013-06-09 18:53:44 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ glib-2.36.3/Makefile.in 2013-07-12 14:13:58 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -686,7 +686,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 gio-unix-2.0.pc.in gio-windows-2.0.pc.in check-abis.sh
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 TEST_PROGS =
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 $(am__append_1)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 DIST_SUBDIRS = $(SUBDIRS) build $(am__append_2)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 bin_SCRIPTS = glib-gettextize
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 diff -ur glib-2.36.3-orig/configure glib-2.36.3/configure
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 --- glib-2.36.3-orig/configure 2013-06-09 18:53:42 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +++ glib-2.36.3/configure 2013-07-12 11:53:11 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 @@ -28768,7 +28768,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 case "$host" in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 *-*-mingw*)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 -$as_echo "#define _GLIB_EXTERN __attribute__((visibility(\"default\"))) __declspec(dllexport) extern" >>confdefs.h
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 +$as_echo "#define _GLIB_EXTERN __declspec(dllexport)" >>confdefs.h
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 - CFLAGS="${CFLAGS} -fvisibility=hidden"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 + #CFLAGS="${CFLAGS} -fvisibility=hidden"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 ;;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 diff -ur glib-2.36.3-orig/depcomp glib-2.36.3/depcomp
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 --- glib-2.36.3-orig/depcomp 2013-06-09 18:53:47 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 +++ glib-2.36.3/depcomp 2013-07-12 12:51:38 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 @@ -542,7 +542,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 s//\1/
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 s/\\/\\\\/g
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 p
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 -}' | $cygpath_u | sort -u | sed -n '
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 +}' | $cygpath_u | /bin/sort -u | sed -n '
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 s/ /\\ /g
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 s/\(.*\)/'"$tab"'\1 \\/p
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 s/.\(.*\) \\/\1:/
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 @@ -751,7 +751,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 esac
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 done
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 "$@" -E 2>/dev/null |
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | /bin/sort -u > "$tmpdepfile"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 rm -f "$depfile"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 echo "$object : \\" > "$depfile"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 diff -ur glib-2.36.3-orig/gio/Makefile.in glib-2.36.3/gio/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 --- glib-2.36.3-orig/gio/Makefile.in 2013-06-09 18:53:45 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 +++ glib-2.36.3/gio/Makefile.in 2013-07-12 13:09:58 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 @@ -861,9 +861,9 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 $(am__append_7) $(am__append_11) $(am__append_14) . \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 $(am__append_17) $(am__append_24)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#noinst_DATA = gio-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 AM_CPPFLAGS = -DG_LOG_DOMAIN=\"GLib-GIO\" $(gmodule_INCLUDES) \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 $(GLIB_DEBUG_FLAGS) -DGIO_COMPILATION \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" $(am__append_10)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 @@ -1215,7 +1215,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 $(NULL)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -export-symbols-regex "xXx"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 diff -ur glib-2.36.3-orig/gio/tests/filter-cat.c glib-2.36.3/gio/tests/filter-cat.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 --- glib-2.36.3-orig/gio/tests/filter-cat.c 2013-06-02 19:20:53 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 +++ glib-2.36.3/gio/tests/filter-cat.c 2013-07-12 13:27:31 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 @@ -30,6 +30,15 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 #include <glib.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 #include <gio/gio.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 +#ifdef _MSC_VER
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 +# ifndef ssize_t
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 + typedef int ssize_t;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 +# endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 +# ifndef STDOUT_FILENO
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +# define STDOUT_FILENO 1
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +# endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 +
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 static gchar **locations = NULL;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 static char *from_charset = NULL;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 static char *to_charset = NULL;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 diff -ur glib-2.36.3-orig/gio/tests/gdbus-connection-loss.c glib-2.36.3/gio/tests/gdbus-connection-loss.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 --- glib-2.36.3-orig/gio/tests/gdbus-connection-loss.c 2013-06-09 18:03:17 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 +++ glib-2.36.3/gio/tests/gdbus-connection-loss.c 2013-07-12 13:58:40 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 @@ -124,7 +124,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 g_assert (g_spawn_command_line_async ("./gdbus-testserver", NULL));
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 /* wait for the service to come up */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 - usleep (500 * 1000);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 + g_usleep (500 * 1000);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 /* Create the connection in the main thread */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 error = NULL;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 diff -ur glib-2.36.3-orig/gio/tests/gdbus-threading.c glib-2.36.3/gio/tests/gdbus-threading.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 --- glib-2.36.3-orig/gio/tests/gdbus-threading.c 2013-06-09 18:03:17 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 +++ glib-2.36.3/gio/tests/gdbus-threading.c 2013-07-12 13:57:58 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 @@ -590,7 +590,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 g_assert (g_spawn_command_line_async ("./gdbus-testserver", NULL));
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 /* wait for the service to come up */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 - usleep (500 * 1000);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 + g_usleep (500 * 1000);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 /* Create the connection in the main thread */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 error = NULL;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 diff -ur glib-2.36.3-orig/glib/Makefile.in glib-2.36.3/glib/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 --- glib-2.36.3-orig/glib/Makefile.in 2013-06-09 18:53:46 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 +++ glib-2.36.3/glib/Makefile.in 2013-07-12 13:09:16 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 @@ -669,8 +669,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 $(pcre_inc) \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 -DG_LOG_DOMAIN=\"GLib\" \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 $(GLIB_DEBUG_FLAGS) \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 - -DGLIB_COMPILATION \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 - -DPCRE_STATIC
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 + -DGLIB_COMPILATION
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 AM_CFLAGS = $(GLIB_WARN_CFLAGS)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 MIRRORING_TAB_SOURCE = \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 @@ -687,9 +686,9 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 glib.rc
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 lib_LTLIBRARIES = libglib-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = glib-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#noinst_DATA = glib-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 deprecated_sources = \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 deprecated/gallocator.c \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 deprecated/gcache.c \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 @@ -817,7 +816,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 gwin32.h \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 gprintf.h
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145 -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146 +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -export-symbols-regex "xXx"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 @OS_WIN32_AND_DLL_COMPILATION_TRUE@glib_win32_res = glib-win32-res.o
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 @OS_WIN32_AND_DLL_COMPILATION_TRUE@glib_win32_res_ldflag = -Wl,$(glib_win32_res)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 @USE_SYSTEM_PCRE_FALSE@pcre_lib = pcre/libpcre.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 diff -ur glib-2.36.3-orig/glib/glib-init.c glib-2.36.3/glib/glib-init.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 --- glib-2.36.3-orig/glib/glib-init.c 2013-06-09 18:03:17 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 +++ glib-2.36.3/glib/glib-init.c 2013-07-12 12:01:48 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 @@ -31,6 +31,10 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154 #include <stdio.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 #include <ctype.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 +#if defined(_MSC_VER) && !defined(strcasecmp)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 +# define strcasecmp _stricmp
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 +
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161 /**
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 * g_mem_gc_friendly:
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 *
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 diff -ur glib-2.36.3-orig/glib/tests/gvariant.c glib-2.36.3/glib/tests/gvariant.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 --- glib-2.36.3-orig/glib/tests/gvariant.c 2013-06-09 18:03:18 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 +++ glib-2.36.3/glib/tests/gvariant.c 2013-07-12 12:22:21 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 @@ -32,8 +32,8 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 * pointers. it is necessary to have special support in the tests
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 * because on most machines malloc() is 8-aligned.
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 -#define ALIGN_BITS (sizeof (struct { char a; union { \
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 - guint64 x; void *y; gdouble z; } b; }) - 9)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 +typedef struct { char a; union { guint64 x; void *y; gdouble z; } b; } ALIGN_BITS_STRUCT;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 +#define ALIGN_BITS (sizeof (ALIGN_BITS_STRUCT) - 9)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 static gboolean
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 randomly (gdouble prob)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178 @@ -2195,7 +2195,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 serialise_tree (TreeInstance *tree,
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
180 GVariantSerialised *serialised)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
181 {
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
182 - GVariantSerialised empty = { };
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
183 + GVariantSerialised empty = { 0, 0, 0 };
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
184
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
185 *serialised = empty;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
186 tree_filler (serialised, tree);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
187 diff -ur glib-2.36.3-orig/glib/tests/mappedfile.c glib-2.36.3/glib/tests/mappedfile.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
188 --- glib-2.36.3-orig/glib/tests/mappedfile.c 2013-06-09 18:03:18 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
189 +++ glib-2.36.3/glib/tests/mappedfile.c 2013-07-12 12:24:52 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
190 @@ -11,6 +11,10 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
191 #include <sys/types.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
192 #include <fcntl.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
193
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
194 +#if defined(_MSC_VER) && !defined(W_OK)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
195 +# define W_OK 2
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
196 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
197 +
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
198 static void
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
199 test_basic (void)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
200 {
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
201 diff -ur glib-2.36.3-orig/glib/tests/mem-overflow.c glib-2.36.3/glib/tests/mem-overflow.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
202 --- glib-2.36.3-orig/glib/tests/mem-overflow.c 2013-06-09 18:03:18 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
203 +++ glib-2.36.3/glib/tests/mem-overflow.c 2013-07-12 12:29:07 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
204 @@ -126,6 +126,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
205 g_free (q);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
206 }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
207
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
208 +#ifndef _MSC_VER
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
209 typedef struct
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
210 {
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
211 } Empty;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
212 @@ -147,6 +148,7 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
213 }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
214 g_test_trap_assert_passed ();
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
215 }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
216 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
217
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
218 int
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
219 main (int argc,
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
220 @@ -157,7 +159,9 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
221 g_test_bug_base ("http://bugzilla.gnome.org/");
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
222
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
223 g_test_add_func ("/mem/overflow", mem_overflow);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
224 +#ifndef _MSC_VER
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
225 g_test_add_func ("/mem/empty-alloc", empty_alloc);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
226 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
227
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
228 return g_test_run();
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
229 }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
230 diff -ur glib-2.36.3-orig/glib/tests/strfuncs.c glib-2.36.3/glib/tests/strfuncs.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
231 --- glib-2.36.3-orig/glib/tests/strfuncs.c 2013-06-02 19:20:53 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
232 +++ glib-2.36.3/glib/tests/strfuncs.c 2013-07-12 12:34:53 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
233 @@ -983,11 +983,13 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
234 check_strtod_string ("-infinity", -our_inf, FALSE, 0);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
235 check_strtod_string ("-.75,0", -0.75, TRUE, 4);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
236
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
237 +#ifndef _MSC_VER
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
238 d = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
239 g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
240
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
241 d = -179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
242 g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
243 +#endif
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
244
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
245 d = pow (2.0, -1024.1);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
246 g_assert (d == g_ascii_strtod (g_ascii_dtostr (buffer, sizeof (buffer), d), NULL));
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
247 diff -ur glib-2.36.3-orig/gmodule/Makefile.in glib-2.36.3/gmodule/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
248 --- glib-2.36.3-orig/gmodule/Makefile.in 2013-06-09 18:53:46 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
249 +++ glib-2.36.3/gmodule/Makefile.in 2013-07-12 13:10:55 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
250 @@ -479,10 +479,10 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
251 libglib = $(top_builddir)/glib/libglib-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
252 top_builddir_full = `cd \$(top_builddir); pwd`
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
253 lib_LTLIBRARIES = libgmodule-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
254 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gmodule-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
255 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
256 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
257 -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
258 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#noinst_DATA = gmodule-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
259 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#install_ms_lib_cmd = $(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
260 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
261 +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -export-symbols-regex "xXx"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
262 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gmodule_win32_res = gmodule-win32-res.o
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
263 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
264 libgmodule_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
265 diff -ur glib-2.36.3-orig/gobject/Makefile.in glib-2.36.3/gobject/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
266 --- glib-2.36.3-orig/gobject/Makefile.in 2013-06-09 18:53:46 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
267 +++ glib-2.36.3/gobject/Makefile.in 2013-07-12 13:11:17 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
268 @@ -558,10 +558,10 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
269
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
270 # libraries to compile and install
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
271 lib_LTLIBRARIES = libgobject-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
272 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gobject-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
273 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gobject-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
274 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gobject-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
275 -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
276 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#noinst_DATA = gobject-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
277 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#install_ms_lib_cmd = $(INSTALL) gobject-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
278 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gobject-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
279 +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -export-symbols-regex "xXx"
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
280 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res = gobject-win32-res.o
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
281 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
282 libgobjectincludedir = $(includedir)/glib-2.0/gobject
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
283 diff -ur glib-2.36.3-orig/gobject/tests/param.c glib-2.36.3/gobject/tests/param.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
284 --- glib-2.36.3-orig/gobject/tests/param.c 2013-06-09 18:03:18 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
285 +++ glib-2.36.3/gobject/tests/param.c 2013-07-12 13:06:13 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
286 @@ -535,56 +535,56 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
287
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
288 static gint valid_impl_types[48][4] = {
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
289 /* a b c GObject */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
290 - /* 'a-' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
291 + /* 'a-' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
292 /* 'a-r' */ { 'v', 'v', '<', '<' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
293 /* 'a-w' */ { 'v', '>', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
294 /* 'a-rw' */ { 'v', '=', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
295 - /* 'a-c */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
296 - /* 'a-rc' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
297 + /* 'a-c */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
298 + /* 'a-rc' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
299 /* 'a-wc' */ { 'v', '>', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
300 /* 'a-rwc' */ { 'v', '=', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
301 - /* 'a-C */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
302 - /* 'a-rC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
303 + /* 'a-C */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
304 + /* 'a-rC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
305 /* 'a-wC' */ { 'v', '>', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
306 /* 'a-rwC' */ { 'v', '=', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
307 - /* 'a-cC */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
308 - /* 'a-rcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
309 - /* 'a-wcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
310 - /* 'a-rwcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
311 + /* 'a-cC */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
312 + /* 'a-rcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
313 + /* 'a-wcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
314 + /* 'a-rwcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
315
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
316 - /* 'b-' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
317 + /* 'b-' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
318 /* 'b-r' */ { '<', 'v', '<', '<' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
319 /* 'b-w' */ { 'v', 'v', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
320 /* 'b-rw' */ { '=', 'v', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
321 - /* 'b-c */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
322 - /* 'b-rc' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
323 + /* 'b-c */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
324 + /* 'b-rc' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
325 /* 'b-wc' */ { 'v', 'v', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
326 /* 'b-rwc' */ { '=', 'v', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
327 - /* 'b-C */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
328 - /* 'b-rC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
329 + /* 'b-C */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
330 + /* 'b-rC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
331 /* 'b-wC' */ { 'v', 'v', '>', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
332 /* 'b-rwC' */ { '=', 'v', '=', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
333 - /* 'b-cC */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
334 - /* 'b-rcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
335 - /* 'b-wcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
336 - /* 'b-rwcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
337 + /* 'b-cC */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
338 + /* 'b-rcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
339 + /* 'b-wcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
340 + /* 'b-rwcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
341
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
342 - /* 'c-' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
343 + /* 'c-' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
344 /* 'c-r' */ { '<', '<', 'v', '<' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
345 /* 'c-w' */ { '>', '>', 'v', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
346 /* 'c-rw' */ { '=', '=', 'v', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
347 - /* 'c-c */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
348 - /* 'c-rc' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
349 + /* 'c-c */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
350 + /* 'c-rc' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
351 /* 'c-wc' */ { '>', '>', 'v', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
352 /* 'c-rwc' */ { '=', '=', 'v', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
353 - /* 'c-C */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
354 - /* 'c-rC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
355 + /* 'c-C */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
356 + /* 'c-rC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
357 /* 'c-wC' */ { '>', '>', 'v', 'v' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
358 /* 'c-rwC' */ { '=', '=', 'v', '=' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
359 - /* 'c-cC */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
360 - /* 'c-rcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
361 - /* 'c-wcC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
362 - /* 'c-rwcC' */ { }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
363 + /* 'c-cC */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
364 + /* 'c-rcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
365 + /* 'c-wcC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
366 + /* 'c-rwcC' */ { 0 }
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
367 };
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
368
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
369 /* We also try to change the flags. We must ensure that all
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
370 @@ -624,16 +624,16 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
371 */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
372 static gint valid_impl_flags[16][16] = {
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
373 /* '' r w rw c rc wc rwc C rC wC rwC cC rcC wcC rwcC */
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
374 - /* '*-' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
375 + /* '*-' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
376 /* '*-r' */ { 'i', 'v', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
377 /* '*-w' */ { 'i', 'f', 'v', 'v', 'i', 'i', 'v', 'v', 'i', 'i', 'r', 'r', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
378 /* '*-rw' */ { 'i', 'f', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'f', 'r', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
379 - /* '*-c */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
380 - /* '*-rc' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
381 + /* '*-c */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
382 + /* '*-rc' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
383 /* '*-wc' */ { 'i', 'f', 'v', 'v', 'i', 'i', 'v', 'v', 'i', 'i', 'r', 'r', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
384 /* '*-rwc' */ { 'i', 'f', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'f', 'r', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
385 - /* '*-C */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
386 - /* '*-rC' */ { },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
387 + /* '*-C */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
388 + /* '*-rC' */ { 0 },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
389 /* '*-wC' */ { 'i', 'f', 'v', 'v', 'i', 'i', 'v', 'v', 'i', 'i', 'v', 'v', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
390 /* '*-rwC' */ { 'i', 'f', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'f', 'v', 'i', 'i', 'i', 'i' },
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
391 };
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
392 diff -ur glib-2.36.3-orig/gthread/Makefile.in glib-2.36.3/gthread/Makefile.in
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
393 --- glib-2.36.3-orig/gthread/Makefile.in 2013-06-09 18:53:47 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
394 +++ glib-2.36.3/gthread/Makefile.in 2013-07-12 12:55:10 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
395 @@ -468,9 +468,9 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
396 libglib = $(top_builddir)/glib/libglib-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
397 top_builddir_full = `cd \$(top_builddir); pwd`
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
398 lib_LTLIBRARIES = libgthread-2.0.la
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
399 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gthread-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
400 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
401 -@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gthread-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
402 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#noinst_DATA = gthread-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
403 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#install_ms_lib_cmd = $(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
404 +@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@#uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gthread-2.0.lib
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
405 @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
406 @OS_WIN32_AND_DLL_COMPILATION_TRUE@export_symbols = -export-symbols $(srcdir)/gthread.def
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
407 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gthread_def = gthread.def
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
408 diff -ur glib-2.36.3-orig/gthread/gthread.def glib-2.36.3/gthread/gthread.def
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
409 --- glib-2.36.3-orig/gthread/gthread.def 2011-08-15 20:51:30 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
410 +++ glib-2.36.3/gthread/gthread.def 2013-07-12 12:59:25 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
411 @@ -1,3 +1,3 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
412 EXPORTS
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
413 - g_thread_init
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
414 - g_thread_init_with_errorcheck_mutexes
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
415 +g_thread_init
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
416 +g_thread_init_with_errorcheck_mutexes
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
417 diff -ur glib-2.36.3-orig/tests/libmoduletestplugin_a.c glib-2.36.3/tests/libmoduletestplugin_a.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
418 --- glib-2.36.3-orig/tests/libmoduletestplugin_a.c 2013-06-02 19:20:49 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
419 +++ glib-2.36.3/tests/libmoduletestplugin_a.c 2013-07-12 14:19:02 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
420 @@ -30,11 +30,11 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
421 #include <gmodule.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
422 #include <stdlib.h>
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
423
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
424 -void gplugin_a_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
425 -void gplugin_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
426 -void g_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
427 -void gplugin_say_boo_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
428 -void gplugin_a_module_func (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
429 +G_MODULE_EXPORT void gplugin_a_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
430 +G_MODULE_EXPORT void gplugin_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
431 +G_MODULE_EXPORT void g_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
432 +G_MODULE_EXPORT void gplugin_say_boo_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
433 +G_MODULE_EXPORT void gplugin_a_module_func (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
434
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
435 G_MODULE_EXPORT gchar* gplugin_a_state;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
436
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
437 diff -ur glib-2.36.3-orig/tests/libmoduletestplugin_b.c glib-2.36.3/tests/libmoduletestplugin_b.c
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
438 --- glib-2.36.3-orig/tests/libmoduletestplugin_b.c 2013-06-02 19:20:49 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
439 +++ glib-2.36.3/tests/libmoduletestplugin_b.c 2013-07-12 14:20:00 -0400
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
440 @@ -31,13 +31,13 @@
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
441
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
442 G_MODULE_EXPORT gchar* gplugin_b_state;
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
443
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
444 -const gchar* g_module_check_init (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
445 -void g_module_unload (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
446 +G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
447 +G_MODULE_EXPORT void g_module_unload (GModule *module);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
448
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
449 -void gplugin_b_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
450 -void gplugin_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
451 -void g_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
452 -void gplugin_say_boo_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
453 +G_MODULE_EXPORT void gplugin_b_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
454 +G_MODULE_EXPORT void gplugin_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
455 +G_MODULE_EXPORT void g_clash_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
456 +G_MODULE_EXPORT void gplugin_say_boo_func (void);
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
457
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
458 G_MODULE_EXPORT const gchar*
2733829a184e [MSVC] enable glib compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
459 g_module_check_init (GModule *module)