[glib/glib-2-32] Revert "gio/Makefile.am: Filter out gcontenttype.c for MSVC builds"
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-32] Revert "gio/Makefile.am: Filter out gcontenttype.c for MSVC builds"
- Date: Tue, 7 Aug 2012 04:38:56 +0000 (UTC)
commit b02b92172dc854f7798622bd74f78d8850998015
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Aug 7 12:36:35 2012 +0800
Revert "gio/Makefile.am: Filter out gcontenttype.c for MSVC builds"
This reverts commit 18801a9a7bc15c9e93789c4fcb224e05ec7e1301.
The change to the GIO source filters only applies to the master/2.33.x+
branch as there isn't a gcontenttype-win32.c in glib-2-32, so we still
want to build gcontenttype.c here.
gio/Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index b172729..69a8cca 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -744,7 +744,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
*.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
;; \
esac; \
@@ -755,7 +755,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
*.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'" />' \
;; \
esac; \
@@ -766,7 +766,7 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10
../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
case $$F in \
- gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
+ gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
*.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
;; \
esac; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]