From b2717740a23ee37d057cc293ee4f92d91993c648 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 23 Sep 2011 10:41:19 +0800
Subject: [PATCH] VS support updates

-Fix GLib project/filter files generation as some source items are under
 the "deprecated" subfolder, and filter out the gthread-*.c
-Explicitly specify gthread-win32.c in the GLib project/filter file
 templates, since tarballs are done on Linux.
-Don't define g_static_mutex_get_mutex in the pregenerated
 glibconfig.h.win32(.in) as it is defined in deprecated/gthread.h for Windows
---
 build/win32/vs10/glib.vcxproj.filtersin |  3 ++
 build/win32/vs10/glib.vcxprojin         |  1 +
 build/win32/vs9/glib.vcprojin           | 77 +++++----------------------------
 glib/Makefile.am                        | 12 ++---
 glib/glibconfig.h.win32.in              |  2 -
 5 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin
index 0b5afaf..253203b 100644
--- a/build/win32/vs10/glib.vcxproj.filtersin
+++ b/build/win32/vs10/glib.vcxproj.filtersin
@@ -31,6 +31,9 @@
     <ClCompile Include="..\..\..\glib\gspawn-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\glib\gthread-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\glib\gwin32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin
index 8bfe969..f8673a9 100644
--- a/build/win32/vs10/glib.vcxprojin
+++ b/build/win32/vs10/glib.vcxprojin
@@ -334,6 +334,7 @@
 #include "libglib.vs10.sourcefiles"
     <ClCompile Include="..\..\..\glib\giowin32.c" />
     <ClCompile Include="..\..\..\glib\gspawn-win32.c" />
+    <ClCompile Include="..\..\..\glib\gthread-win32.c" />
     <ClCompile Include="..\..\..\glib\gwin32.c" />
     <ClCompile Include="..\..\..\glib\libcharset\localcharset.c">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_ExtPCRE|Win32'">LIBDIR=/irrelevant/lib;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index f1e5829..7b8a3e5 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -291,77 +291,20 @@
 #include "libglib.sourcefiles"
 			<File RelativePath="..\..\..\glib\giowin32.c" />
 			<File RelativePath="..\..\..\glib\gspawn-win32.c" />
+			<File RelativePath="..\..\..\glib\gthread-win32.c" />
 			<File RelativePath="..\..\..\glib\gwin32.c" />
 			<Filter
 				Name="libcharset"
 				>
-				<File
-					RelativePath="..\..\..\glib\libcharset\localcharset.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug_ExtPCRE|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug_ExtPCRE|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release_ExtPCRE|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release_ExtPCRE|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
+				<File RelativePath="..\..\..\glib\libcharset\localcharset.c">
+					<FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Debug_ExtPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Debug_ExtPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Release_ExtPCRE|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
+					<FileConfiguration Name="Release_ExtPCRE|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"/></FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
diff --git a/glib/Makefile.am b/glib/Makefile.am
index c37f0e3..5d005f5 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -459,9 +459,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 	  cp $$d/$$f $(distdir) || exit 1; done
 
 ../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
-	for F in $(libglib_2_0_la_SOURCES); do \
+	for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
-		*-gcc.c|*-unix.c) \
+		*-unix.c|gthread-*.c) \
 			;; \
 		*.c)	echo '   <File RelativePath="..\..\..\glib\'$$F'" />' \
 			;; \
@@ -471,9 +471,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 	rm libglib.sourcefiles
 
 ../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin
-	for F in $(libglib_2_0_la_SOURCES); do \
+	for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
-		*-gcc.c|*-unix.c) \
+		*-unix.c|gthread-*.c) \
 			;; \
 		*.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'" />' \
 		     ;; \
@@ -483,9 +483,9 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs1
 	rm libglib.vs10.sourcefiles
 
 ../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin
-	for F in $(libglib_2_0_la_SOURCES); do \
+	for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \
 		case $$F in \
-		*-gcc.c|*-unix.c) \
+		*-unix.c|gthread-*.c) \
 			;; \
 		*.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 		     ;; \
diff --git a/glib/glibconfig.h.win32.in b/glib/glibconfig.h.win32.in
index fbac9d2..13b2e69 100644
--- a/glib/glibconfig.h.win32.in
+++ b/glib/glibconfig.h.win32.in
@@ -208,8 +208,6 @@ typedef unsigned __int64 guintptr;
 #define G_THREADS_IMPL_WIN32
 typedef struct _GMutex* GStaticMutex;
 #define G_STATIC_MUTEX_INIT NULL
-#define g_static_mutex_get_mutex(mutex) \
-  (g_static_mutex_get_mutex_impl_shortcut (mutex))
 /* This represents a system thread as used by the implementation. An
  * alien implementaion, as loaded by g_thread_init can only count on
  * "sizeof (gpointer)" bytes to store their info. We however need more
-- 
2.7.4