mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 10:08:56 +01:00 
			
		
		
		
	gio/Makefile.am: Filter out gcontenttype.c for MSVC builds
gcontenttype.c was split into gcontenttype.c and gcontenttype-win32.c
in commit 32192ee9 ("Split gcontenttype.c"), so we don't want to include
gcontenttype.c in the Visual C++ build as it is no longer a source file
meant for Windows.
Thanks to Thomas H.P. Anderson for pointing this out.
			
			
This commit is contained in:
		@@ -751,7 +751,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
 | 
					../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 \
 | 
						for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
 | 
				
			||||||
		case $$F in \
 | 
							case $$F in \
 | 
				
			||||||
		gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
 | 
							gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
 | 
				
			||||||
		*.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
 | 
							*.c) echo '   <File RelativePath="..\..\..\gio\'$$F'" />' \
 | 
				
			||||||
		     ;; \
 | 
							     ;; \
 | 
				
			||||||
		esac; \
 | 
							esac; \
 | 
				
			||||||
@@ -762,7 +762,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
 | 
					../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 \
 | 
						for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
 | 
				
			||||||
		case $$F in \
 | 
							case $$F in \
 | 
				
			||||||
		gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
 | 
							gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
 | 
				
			||||||
		*.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
 | 
							*.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
 | 
				
			||||||
		     ;; \
 | 
							     ;; \
 | 
				
			||||||
		esac; \
 | 
							esac; \
 | 
				
			||||||
@@ -773,7 +773,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
 | 
					../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 \
 | 
						for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
 | 
				
			||||||
		case $$F in \
 | 
							case $$F in \
 | 
				
			||||||
		gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c) ;; \
 | 
							gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
 | 
				
			||||||
		*.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 | 
							*.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
 | 
				
			||||||
		     ;; \
 | 
							     ;; \
 | 
				
			||||||
		esac; \
 | 
							esac; \
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user