Rename gtk/gtk.rc.in to gtk/gtk-win32.rc.in because the build-dll
script (in GLib) looks for the resource file having the same basename as the DLL being built. Update configure.in and gtk/Makefile.am accordingly.
This commit is contained in:
		@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
	* gdk/win32/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* gtk/gtk.rc: Remove.
 | 
			
		||||
	* gtk/gtk.rc.in: New file.
 | 
			
		||||
	* gtk/gtk-win32.rc.in: New file.
 | 
			
		||||
	* gtk/Makefile.am: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
	* configure.in: Corresponding changes.
 | 
			
		||||
 | 
			
		||||
@ -1046,7 +1046,7 @@ gtk/Makefile
 | 
			
		||||
gtk/makefile.mingw
 | 
			
		||||
gtk/makefile.msc
 | 
			
		||||
gtk/gtkcompat.h
 | 
			
		||||
gtk/gtk.rc
 | 
			
		||||
gtk/gtk-win32.rc
 | 
			
		||||
gtk/stock-icons/Makefile
 | 
			
		||||
modules/Makefile
 | 
			
		||||
modules/linux-fb/Makefile
 | 
			
		||||
 | 
			
		||||
@ -613,7 +613,7 @@ makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.mingw.i
 | 
			
		||||
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gtk/makefile.msc.in
 | 
			
		||||
	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 | 
			
		||||
 | 
			
		||||
gtk.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk.rc.in
 | 
			
		||||
gtk-win32.rc: $(top_builddir)/config.status $(top_srcdir)/gtk/gtk-win32.rc.in
 | 
			
		||||
	cd $(top_builddir) && CONFIG_FILES=gtk/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 | 
			
		||||
 | 
			
		||||
.PHONY: files test test-debug
 | 
			
		||||
@ -656,8 +656,8 @@ EXTRA_DIST += @STRIP_BEGIN@ 	\
 | 
			
		||||
	check-n.xpm		\
 | 
			
		||||
	test.xpm		\
 | 
			
		||||
	gtk.def			\
 | 
			
		||||
	gtk.rc			\
 | 
			
		||||
	gtk.rc.in		\
 | 
			
		||||
	gtk-win32.rc		\
 | 
			
		||||
	gtk-win32.rc.in		\
 | 
			
		||||
	makefile.mingw		\
 | 
			
		||||
	makefile.mingw.in	\
 | 
			
		||||
	makefile.msc		\
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user