gtk+.vsprops: Removed GdkPixbuf stuff and made up for missed headers
-Removed the GdkPixbuf stuff as it is now in a package of its own and added it as a dependent library here -Made up for the headers missed in the installation stage for GTK+/GDK
This commit is contained in:
		 Chun-wei Fan
					Chun-wei Fan
				
			
				
					committed by
					
						 Tristan Van Berkom
						Tristan Van Berkom
					
				
			
			
				
	
			
			
			 Tristan Van Berkom
						Tristan Van Berkom
					
				
			
						parent
						
							67112dae94
						
					
				
				
					commit
					5c52344551
				
			| @ -8,13 +8,13 @@ | ||||
| 	> | ||||
| 	<Tool | ||||
| 		Name="VCCLCompilerTool" | ||||
| 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0" | ||||
| 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\GdkPixbuf-2.0" | ||||
| 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES" | ||||
| 		ForcedIncludeFiles="msvc_recommended_pragmas.h" | ||||
| 	/> | ||||
| 	<Tool | ||||
| 		Name="VCLinkerTool" | ||||
| 		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib" | ||||
| 		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib" | ||||
| 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib" | ||||
| 	/> | ||||
| 	<Tool | ||||
| @ -31,7 +31,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
 | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GtkApiVersion" | ||||
| 		Value="3.0" | ||||
| 		Value="2.0" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GtkBinaryVersion" | ||||
| @ -45,18 +45,6 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
 | ||||
| 		Name="GtkPrefixDefine" | ||||
| 		Value="GTK_PREFIX=\"$(GtkDummyPrefix)\"" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GdkPixbufIncludedLoaderDefines" | ||||
| 		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GdkPixbufDefines" | ||||
| 		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GdkPixbufLibdirDefine" | ||||
| 		Value="PIXBUF_LIBDIR=\"$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\"" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GdkDefines" | ||||
| 		Value="GDK_COMPILATION;G_LOG_DOMAIN=\"Gdk\"" | ||||
| @ -75,24 +63,20 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
 | ||||
| echo on
 | ||||
| mkdir $(OutDir)\bin
 | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin
 | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin
 | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(OutDir)\bin
 | ||||
|  | ||||
| mkdir $(OutDir)\bin\gtk-demo
 | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.exe $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk-demo
 | ||||
| copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk-demo
 | ||||
|  | ||||
| mkdir $(OutDir)\lib
 | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib
 | ||||
|  | ||||
| mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
| copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf
 | ||||
|  | ||||
| mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| @ -108,9 +92,11 @@ copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
&# | ||||
| copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkkeysyms-compat.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk
 | ||||
| @ -158,6 +144,7 @@ copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\ | ||||
| copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| @ -239,6 +226,7 @@ copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
& | ||||
| copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| @ -282,6 +270,7 @@ copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
� | ||||
| copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| @ -308,6 +297,8 @@ copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\g | ||||
| copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk
 | ||||
| @ -344,10 +335,6 @@ copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include
&# | ||||
| copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib
 | ||||
| " | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GtkGenerateGdkPixbufDef" | ||||
| 		Value="echo EXPORTS >"$(IntDir)\gdk-pixbuf.def" && cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols >>"$(IntDir)\gdk-pixbuf.def"" | ||||
| 	/> | ||||
| 	<UserMacro | ||||
| 		Name="GtkGenerateGdkDef" | ||||
| 		Value="echo EXPORTS >"$(IntDir)\gdk.def" && cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols >>"$(IntDir)\gdk.def"" | ||||
|  | ||||
		Reference in New Issue
	
	Block a user