diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 860973b73e..c9a731b693 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -459,13 +459,6 @@ MSVCPROJS = gdk-3 gdk_3_FILES = $(gdk_c_sources) gdk_3_EXCLUDES = dummy -gdk_3_HEADERS_DIR = $(gdkincludedir) - -gdk_3_HEADERS_INST = \ - $(gdkinclude_HEADERS) \ - $(deprecatedinclude_HEADERS) - -gdk_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj @@ -510,7 +503,6 @@ endif dist-hook: \ $(top_builddir)/win32/vs9/gdk-3.vcproj \ - $(top_builddir)/win32/vs9/gdk-3.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am index 81725deabb..3b518700dc 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -72,11 +72,6 @@ MSVCPROJS = gdk3-broadway broadwayd gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES) gdk3_broadway_EXCLUDES = dummy -gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir) - -gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS) - -gdk3_broadway_HEADERS_EXCLUDES = dummy broadwayd_FILES = $(broadwayd_SOURCES) broadwayd_EXCLUDES = dummy @@ -85,7 +80,6 @@ include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ $(top_builddir)/win32/vs9/gdk3-broadway.vcproj \ - $(top_builddir)/win32/vs9/broadwayd.vcproj \ - $(top_builddir)/win32/vs9/gdk3-broadway.headers + $(top_builddir)/win32/vs9/broadwayd.vcproj -include $(top_srcdir)/git.mk diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index a665a9cc02..586e8fddc0 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -47,16 +47,10 @@ MSVCPROJS = gdk3-win32 gdk3_win32_FILES = $(libgdk_win32_la_SOURCES) gdk3_win32_EXCLUDES = dummy -gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir) - -gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) - -gdk3_win32_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/win32/vs9/gdk3-win32.vcproj \ - $(top_builddir)/win32/vs9/gdk3-win32.headers + $(top_builddir)/win32/vs9/gdk3-win32.vcproj -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index c7c7caabd2..81d6ed2736 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -526,14 +526,6 @@ gtk_3_FILES = \ $(gtk_use_win32_c_sources) gtk_3_EXCLUDES = dummy -gtk_3_HEADERS_DIR = $(gtkincludedir) - -gtk_3_HEADERS_INST = \ - $(filter-out gtkversion.h, $(gtkinclude_HEADERS)) \ - $(a11y_h_sources) \ - $(gtk_deprecated_h_sources) - -gtk_3_HEADERS_EXCLUDES = gtktypebuiltins.h include $(top_srcdir)/win32/Makefile.msvcproj @@ -590,7 +582,6 @@ endif dist-hook: \ $(top_builddir)/win32/vs9/gtk-3.vcproj \ - $(top_builddir)/win32/vs9/gtk-3.headers \ $(INTROSPECTION_INTERMEDIATE_ITEMS) # Install a RC file for the default GTK+ theme, and key themes diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am index aa2f93adcb..0b389ad8b8 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -82,16 +82,10 @@ MSVCPROJS = gailutil-3 gailutil_3_FILES = $(libgailutil_3_la_SOURCES) gailutil_3_EXCLUDES = dummy -gailutil_3_HEADERS_DIR = $(libgailutilincludedir) - -gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS) - -gailutil_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/win32/vs9/gailutil-3.vcproj \ - $(top_builddir)/win32/vs9/gailutil-3.headers + $(top_builddir)/win32/vs9/gailutil-3.vcproj -include $(top_srcdir)/git.mk diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj index cd7e469fb1..c341313aee 100644 --- a/win32/Makefile.msvcproj +++ b/win32/Makefile.msvcproj @@ -17,13 +17,9 @@ # MSVCPROJS = YourProject (can be multiple projects in a single srcdir) # YourProject_FILES = $(libyourlib_1_0_SOURCES) # YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# YourProject_HEADERS_DIR = $(libyourlibincludedir) -# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) -# YourProject_HEADERS_EXCLUDES = ... # # # dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/win32/vs9/YourProject.headers +# $(top_builddir)/win32/vs9/YourProject.vcproj # Private functions @@ -40,13 +36,6 @@ _proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) _proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) _proj_filters=$($(_proj_name)_EXCLUDES) -_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) -_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) -_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) - -_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) -_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) - # # Creates Visual Studio 2008/2010 projects from items passed in from autotools files # $(1) - Base Name of the MSVC project files (outputs) @@ -95,23 +84,6 @@ $(top_builddir)/win32/vs9/$(1).vcproj: Makefile $(RM) $(1).vs10.sourcefiles $(RM) $(1).vs10.sourcefiles.filters -$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers - -$(top_builddir)/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/win32/vs9/$(1).headers && \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - endef $(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am index 30df5f1d74..f12a18434f 100644 --- a/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -21,13 +21,6 @@ GENERATED_ITEMS = \ gailutil-3.vcxproj.filters \ gtk3-version-paths.props -MSVC10_HEADERS_LISTS = \ - gdk3-win32.vs10.headers \ - gdk3-broadway.vs10.headers \ - gdk-3.vs10.headers \ - gtk-3.vs10.headers \ - gailutil-3.vs10.headers - EXTRA_DIST += \ README.txt \ gtk+.sln \ @@ -69,13 +62,4 @@ EXTRA_DIST += \ DISTCLEANFILES = \ $(GENERATED_ITEMS) -gtk3-install.props: $(top_srcdir)/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS) - -$(RM) $(top_builddir)/win32/vs11/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs12/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs14/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs15/gtk3-install.props - -$(RM) $(top_builddir)/win32/vs16/gtk3-install.props - $(CPP) -P - <$(top_srcdir)/win32/vs10/gtk3-install.propsin >$@ - rm $(MSVC10_HEADERS_LISTS) - -include $(top_srcdir)/git.mk diff --git a/win32/vs10/gtk3-install.propsin b/win32/vs10/gtk3-install.propsin deleted file mode 100644 index 7e6cc466d3..0000000000 --- a/win32/vs10/gtk3-install.propsin +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - $(SolutionDir)$(Configuration)\$(Platform)\bin - -mkdir $(CopyDir)\bin -mkdir $(CopyDir)\share\gir-1.0 -mkdir $(CopyDir)\lib\pkgconfig -mkdir $(CopyDir)\lib\girepository-1.0 - -copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib - -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN -copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin -copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib -copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib -copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin -copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin -copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin -if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0 -if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0 -goto DONE_BIN - -:DO_BROADWAY_BIN -copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin -copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin - -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG -:DO_BROADWAY_RELEASE -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib -copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib -copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin -copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin -if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0 - -goto DONE_BIN - -:DO_BROADWAY_DEBUG -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib -copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib -copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin -copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin -if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0 -if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0 -if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0 - -:DONE_BIN - -copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig -copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc -copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig -copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc" -copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig - - -echo off -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32 -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated -copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk - -if "$(Configuration)" == "Release" goto COPY_RELEASE_BUILT_HEADERS -if "$(Configuration)" == "Release_Broadway" goto COPY_RELEASE_BUILT_HEADERS -if "$(Configuration)" == "Debug" goto COPY_DEBUG_BUILT_HEADERS -if "$(Configuration)" == "Debug_Broadway" goto COPY_DEBUG_BUILT_HEADERS - -:COPY_DEBUG_BUILT_HEADERS -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -copy .\Debug\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -goto CONTINUE_HEADERS - -:COPY_RELEASE_BUILT_HEADERS -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkconfig.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gdk-3\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -copy .\Release\$(Platform)\obj\gtk-3\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -copy .\Release\$(Platform)\obj\gtk-3\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk -goto CONTINUE_HEADERS - -:CONTINUE_HEADERS -#include "gdk-3.vs10.headers" -#include "gdk3-win32.vs10.headers" - -#include "gtk-3.vs10.headers" - -mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util -#include "gailutil-3.vs10.headers" - - -for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps)) - -mkdir $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas -copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas - - -copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk -mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway -#include "gdk3-broadway.vs10.headers" - - -echo "Compiling gsettings XML Files..." -$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas - -echo "Generating icon cache......" -$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" - - $(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) - $(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) - ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc - - - <_PropertySheetDisplayName>gtk3installsprops - - - - $(BinDir) - - - $(InstalledDlls) - - - $(InstalledBins) - - - $(InstalledBroadwayBins) - - - $(GtkDoInstallBin) - - - $(GtkDoInstall) - - - $(GtkDoInstallBroadwayHeaders) - - - $(GtkPostInstall) - - - $(GenerateGtkPC) - - - $(GenerateGtkPCX64) - - - $(GtkPCFiles) - - - diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am index 4b6120ae37..f19e52c9f2 100644 --- a/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -1,12 +1,5 @@ include $(top_srcdir)/Makefile.decl -MSVC_HEADERS_LISTS = \ - gdk3-win32.headers \ - gdk3-broadway.headers \ - gdk-3.headers \ - gtk-3.headers \ - gailutil-3.headers - GENERATED_ITEMS = \ gdk3-win32.vcproj \ gdk3-broadway.vcproj \ @@ -44,10 +37,6 @@ EXTRA_DIST += \ gtk3-version-paths.vsprops.in \ $(GENERATED_ITEMS) -gtk3-install.vsprops: $(top_srcdir)/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS) - $(CPP) -P - <$(top_srcdir)/win32/vs9/gtk3-install.vspropsin >$@ - rm $(MSVC_HEADERS_LISTS) - DISTCLEANFILES = $(GENERATED_ITEMS) -include $(top_srcdir)/git.mk diff --git a/win32/vs9/gtk3-install.vspropsin b/win32/vs9/gtk3-install.vspropsin deleted file mode 100644 index 4fb97df337..0000000000 --- a/win32/vs9/gtk3-install.vspropsin +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - -