From 440713e393cf99e29f716f5f634d4bc4ce0e281c Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 22 Mar 2010 15:53:47 +0200
Subject: [PATCH] Filter out gatomic-gcc.c from the VS project sources

Instead, explicitly include gatomic.c.
---
 build/win32/vs9/glib.vcprojin | 1 +
 glib/Makefile.am              | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin
index 560ca63..fc7e88e 100644
--- a/build/win32/vs9/glib.vcprojin
+++ b/build/win32/vs9/glib.vcprojin
@@ -157,6 +157,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "libglib.sourcefiles"
+			<File RelativePath="..\..\..\glib\gatomic.c" />
 			<File RelativePath="..\..\..\glib\giowin32.c" />
 			<File RelativePath="..\..\..\glib\gspawn-win32.c" />
 			<File RelativePath="..\..\..\glib\gwin32.c" />
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 9428f62..8882ae2 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -393,8 +393,10 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
 ../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin
 	for F in $(libglib_2_0_la_SOURCES); do \
 		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\glib\'$$F'" />' \
-		     ;; \
+		*-gcc.c) \
+			;; \
+		*.c)	echo '   <File RelativePath="..\..\..\glib\'$$F'" />' \
+			;; \
 		esac; \
 	done >libglib.sourcefiles
 	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
-- 
2.7.4