diff --git a/Makefile.am b/Makefile.am index 4334c7bd08..8b09aa93ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples -SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build +SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am deleted file mode 100644 index a93ba432f1..0000000000 --- a/build/Makefile-newvs.am +++ /dev/null @@ -1,53 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support, and is copied into -# $(srcroot)/build/. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) -# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET) - -if MSVC_BASE_NO_TOOLSET_SET -MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 -endif - -if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 -endif - -%.sln: $(top_builddir)/build/win32/vs10/Makefile - sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: $(top_builddir)/build/win32/vs10/Makefile - sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: $(top_builddir)/build/win32/vs10/Makefile - if test -e $(top_srcdir)/build/win32/vs10/$@; then \ - cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index b243d647e9..0000000000 --- a/build/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -include $(top_srcdir)/Makefile.decl - -SUBDIRS = win32 - --include $(top_srcdir)/git.mk diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak deleted file mode 100644 index c58fc5f4e6..0000000000 --- a/build/win32/generate-msvc.mak +++ /dev/null @@ -1,222 +0,0 @@ -# NMake Makefile portion for code generation and -# intermediate build directory creation -# Items in here should not need to be edited unless -# one is maintaining the NMake build files. - -!include config-msvc.mak -!include create-lists-msvc.mak - -# Copy the pre-defined gdkconfig.h.[win32|win32_broadway] -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -GDK_OLD_CFG = debug -!else -GDK_OLD_CFG = release -!endif - -!ifdef BROADWAY -GDK_CONFIG = broadway -GDK_DEL_CONFIG = win32 -GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32_broadway -!else -GDK_CONFIG = win32 -GDK_DEL_CONFIG = broadway -GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32 -!endif - -GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers -GDK_RESOURCES_ARGS = ..\..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register -GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers -GTK_RESOURCES_ARGS = ..\..\gtk\gtk.gresource.xml --target=$@ --sourcedir=..\..\gtk --c-name _gtk --manual-register - -all: \ - ..\..\config.h \ - ..\..\gdk\gdkconfig.h \ - ..\..\gdk\gdkversionmacros.h \ - ..\..\gdk\gdkmarshalers.h \ - ..\..\gdk\gdkmarshalers.c \ - ..\..\gdk\gdkresources.h \ - ..\..\gdk\gdkresources.c \ - ..\..\gtk\gtk-win32.rc \ - ..\..\gtk\libgtk3.manifest \ - ..\..\gtk\gtkdbusgenerated.h \ - ..\..\gtk\gtkdbusgenerated.c \ - ..\..\gtk\gtktypefuncs.inc \ - ..\..\gtk\gtk.gresource.xml \ - ..\..\gtk\gtkmarshalers.h \ - ..\..\gtk\gtkmarshalers.c \ - ..\..\gtk\gtkresources.h \ - ..\..\gtk\gtkresources.c \ - ..\..\demos\gtk-demo\demos.h \ - ..\..\demos\gtk-demo\demo_resources.c \ - ..\..\demos\icon-browser\resources.c - -# Copy the pre-defined config.h.win32 and demos.h.win32 -..\..\config.h: ..\..\config.h.win32 -..\..\demos\gtk-demo\demos.h: ..\..\demos\gtk-demo\demos.h.win32 -..\..\gtk\gtk-win32.rc: ..\..\gtk\gtk-win32.rc.body - -..\..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE) - @if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build - @if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build - @if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build - @copy $** $@ - -..\..\gdk\gdkconfig.h: ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build - -..\..\config.h \ -..\..\gdk\gdkconfig.h \ -..\..\gtk\gtk-win32.rc \ -..\..\demos\gtk-demo\demos.h: - @echo Copying $@... - @copy $** $@ - -..\..\gdk\gdkversionmacros.h: ..\..\gdk\gdkversionmacros.h.in - @echo Generating $@... - @$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION) - -..\..\gdk\gdkmarshalers.h: ..\..\gdk\gdkmarshalers.list - @echo Generating $@... - @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp - @move $@.tmp $@ - -..\..\gdk\gdkmarshalers.c: ..\..\gdk\gdkmarshalers.list - @echo Generating $@... - @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp - @move $@.tmp $@ - -..\..\gdk\gdk.gresource.xml: $(GDK_RESOURCES) - @echo Generating $@... - @echo ^ >$@ - @echo ^ >> $@ - @echo ^ >> $@ - @for %%f in (..\..\gdk\resources\glsl\*.glsl) do @echo ^resources/glsl/%%~nxf^ >> $@ - @echo ^ >> $@ - @echo ^ >> $@ - -..\..\gdk\gdkresources.h: ..\..\gdk\gdk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header - -..\..\gdk\gdkresources.c: ..\..\gdk\gdk.gresource.xml $(GDK_RESOURCES) - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source - -..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in - @echo Generating $@... - @$(PYTHON) replace.py \ - --action=replace-var \ - --input=$** --output=$@ \ - --var=EXE_MANIFEST_ARCHITECTURE \ - --outstring=* - -..\..\gtk\gtkdbusgenerated.h ..\..\gtk\gtkdbusgenerated.c: ..\..\gtk\gtkdbusinterfaces.xml - @echo Generating GTK DBus sources... - @$(PYTHON) $(PREFIX)\bin\gdbus-codegen \ - --interface-prefix org.Gtk. --c-namespace _Gtk \ - --generate-c-code gtkdbusgenerated $** \ - --output-directory $(@D) - -..\..\gtk\gtktypefuncs.inc: ..\..\gtk\gentypefuncs.py - @echo Generating $@... - @echo #undef GTK_COMPILATION > $(@R).preproc.c - @echo #include "gtkx.h" >> $(@R).preproc.c - @cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c - @$(PYTHON) $** $@ $(@R).combined.c - @del $(@R).preproc.c $(@R).combined.c - -..\..\gtk\gtk.gresource.xml: $(GTK_RESOURCES) - @echo Generating $@... - @echo ^> $@ - @echo ^>> $@ - @echo ^>> $@ - @echo ^theme/Adwaita/gtk.css^>> $@ - @echo ^theme/Adwaita/gtk-dark.css^>> $@ - @echo ^theme/Adwaita/gtk-contained.css^>> $@ - @echo ^theme/Adwaita/gtk-contained-dark.css^>> $@ - @for %%f in (..\..\gtk\theme\Adwaita\assets\*.png) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ - @for %%f in (..\..\gtk\theme\Adwaita\assets\*.svg) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ - @echo ^theme/HighContrast/gtk.css^>> $@ - @echo ^theme/HighContrast/gtk-inverse.css^>> $@ - @echo ^theme/HighContrast/gtk-contained.css^>> $@ - @echo ^theme/HighContrast/gtk-contained-inverse.css^>> $@ - @for %%f in (..\..\gtk\theme\HighContrast\assets\*.png) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ - @for %%f in (..\..\gtk\theme\HighContrast\assets\*.svg) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ - @echo ^theme/win32/gtk-win32-base.css^>> $@ - @echo ^theme/win32/gtk.css^>> $@ - @for %%f in (..\..\gtk\cursor\*.png) do @echo ^cursor/%%~nxf^>> $@ - @for %%f in (..\..\gtk\gesture\*.symbolic.png) do @echo ^gesture/%%~nxf^>> $@ - @for %%f in (..\..\gtk\ui\*.ui) do @echo ^ui/%%~nxf^>> $@ - @for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\..\gtk\icons\%%sx%%s\%%c\*.png) do @echo ^icons/%%sx%%s/%%c/%%~nxf^>> $@)) - @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\..\gtk\icons\%%s\%%c\*.svg) do @echo ^icons/%%s/%%c/%%~nxf^>> $@)) - @for %%f in (..\..\gtk\inspector\*.ui) do @echo ^inspector/%%~nxf^>> $@ - @echo ^inspector/logo.png^>> $@ - @echo ^emoji/emoji.data^>> $@ - @echo ^>> $@ - @echo ^>> $@ - -..\..\gtk\gtkresources.h: ..\..\gtk\gtk.gresource.xml - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header - -..\..\gtk\gtkresources.c: ..\..\gtk\gtk.gresource.xml $(GTK_RESOURCES) - @echo Generating $@... - @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) - @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) - @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) - @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source - -..\..\gtk\gtkmarshalers.h: ..\..\gtk\gtkmarshalers.list - @echo Generating $@... - @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp - @move $@.tmp $@ - -..\..\gtk\gtkmarshalers.c: ..\..\gtk\gtkmarshalers.list - @echo Generating $@... - @echo #undef G_ENABLE_DEBUG> $@.tmp - @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp - @move $@.tmp $@ - -..\..\demos\gtk-demo\demo_resources.c: ..\..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES) - @echo Generating $@... - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml - -..\..\demos\icon-browser\resources.c: ..\..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES) - @echo Generating $@... - @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml - -# Remove the generated files -clean: - @-del /f /q ..\..\demos\icon-browser\resources.c - @-del /f /q ..\..\demos\gtk-demo\demo_resources.c - @-del /f /q ..\..\demos\gtk-demo\demos.h - @-del /f /q ..\..\gtk\gtkresources.c - @-del /f /q ..\..\gtk\gtkresources.h - @-del /f /q ..\..\gtk\gtkmarshalers.c - @-del /f /q ..\..\gtk\gtkmarshalers.h - @-del /f /q ..\..\gtk\gtk.gresource.xml - @-del /f /q ..\..\gtk\gtktypefuncs.inc - @-del /f /q ..\..\gtk\gtkdbusgenerated.c - @-del /f /q ..\..\gtk\gtkdbusgenerated.h - @-del /f /q ..\..\gtk\libgtk3.manifest - @-del /f /q ..\..\gtk\gtk-win32.rc - @-del /f /q ..\..\gdk\gdkresources.c - @-del /f /q ..\..\gdk\gdkresources.h - @-del /f /q ..\..\gdk\gdk.gresource.xml - @-del /f /q ..\..\gdk\gdkmarshalers.c - @-del /f /q ..\..\gdk\gdkmarshalers.h - @-del /f /q ..\..\gdk\gdkversionmacros.h - @-del /f /q ..\..\gdk\gdkconfig.h - @if exist ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_CONFIG)-build - @if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build - @if exist ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build - @if exist ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build - @-del /f /q ..\..\config.h diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-3.vcxproj.filtersin deleted file mode 100644 index 861d6d0d02..0000000000 --- a/build/win32/vs10/gtk-3.vcxproj.filtersin +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Resource Files - - -#include "gtk-3.vs10.sourcefiles.filters" - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - - - Resource Files - - diff --git a/configure.ac b/configure.ac index a025a3f8f9..224136213f 100644 --- a/configure.ac +++ b/configure.ac @@ -1964,18 +1964,17 @@ docs/reference/gtk/getting_started.xml docs/reference/libgail-util/Makefile docs/reference/libgail-util/version.xml docs/tools/Makefile -build/Makefile -build/win32/Makefile -build/win32/config-msvc.mak -build/win32/vs9/Makefile -build/win32/vs9/gtk3-version-paths.vsprops -build/win32/vs10/Makefile -build/win32/vs10/gtk3-version-paths.props -build/win32/vs11/Makefile -build/win32/vs12/Makefile -build/win32/vs14/Makefile -build/win32/vs15/Makefile -build/win32/vs16/Makefile +win32/Makefile +win32/config-msvc.mak +win32/vs9/Makefile +win32/vs9/gtk3-version-paths.vsprops +win32/vs10/Makefile +win32/vs10/gtk3-version-paths.props +win32/vs11/Makefile +win32/vs12/Makefile +win32/vs14/Makefile +win32/vs15/Makefile +win32/vs16/Makefile gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index f035c76fc2..4a2f827469 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -196,11 +196,11 @@ gtk3_demo_EXCLUDES = font_features.c|pagesetup.c gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES) gtk3_demo_application_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gtk3-demo.vcproj \ - $(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj + $(top_builddir)/win32/vs9/gtk3-demo.vcproj \ + $(top_builddir)/win32/vs9/gtk3-demo-application.vcproj DISTCLEANFILES = demos.h demos.h.win32 diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am index d5f933bf2f..bf8425c86d 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -43,8 +43,8 @@ MSVCPROJS = gtk3-icon-browser gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES) gtk3_icon_browser_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj -dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj +dist-hook: $(top_builddir)/win32/vs9/gtk3-icon-browser.vcproj -include $(top_srcdir)/git.mk diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3f915b6be2..710a5488ae 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -510,7 +510,7 @@ gdk_3_HEADERS_INST = \ gdk_3_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -518,13 +518,13 @@ MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir BASE_MSVC_GIR_CFLAGS = \ $(GDK_CFLAGS_DEFINES) \ - -I../.. -I../../gdk -I.../../gdk/win32 + -I.. -I../gdk -I../gdk/win32 INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Gdk_3_0_gir_list \ - $(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/GdkWin32_3_0_gir_list + $(top_builddir)/win32/Gdk-3.0.gir.msvc.introspect \ + $(top_builddir)/win32/Gdk_3_0_gir_list \ + $(top_builddir)/win32/GdkWin32-3.0.gir.msvc.introspect \ + $(top_builddir)/win32/GdkWin32_3_0_gir_list Gdk_3_0_gir_MSVC_FILES = $(introspection_files) Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES) @@ -542,15 +542,15 @@ GdkWin32_3_0_gir_MSVC_SCANNERFLAGS = \ --c-include="gdk/gdkwin32.h" \ --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir' -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk-3.vcproj \ - $(top_builddir)/build/win32/vs9/gdk-3.headers \ + $(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 fd4b9d1414..a43a577686 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -126,11 +126,11 @@ gdk3_broadway_HEADERS_EXCLUDES = dummy broadwayd_FILES = $(broadwayd_SOURCES) broadwayd_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk3-broadway.vcproj \ - $(top_builddir)/build/win32/vs9/broadwayd.vcproj \ - $(top_builddir)/build/win32/vs9/gdk3-broadway.headers + $(top_builddir)/win32/vs9/gdk3-broadway.vcproj \ + $(top_builddir)/win32/vs9/broadwayd.vcproj \ + $(top_builddir)/win32/vs9/gdk3-broadway.headers -include $(top_srcdir)/git.mk diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 2d7e259e4d..3081b69a4a 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -107,10 +107,10 @@ gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) gdk3_win32_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk3-win32.vcproj \ - $(top_builddir)/build/win32/vs9/gdk3-win32.headers + $(top_builddir)/win32/vs9/gdk3-win32.vcproj \ + $(top_builddir)/win32/vs9/gdk3-win32.headers -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 16adda02ae..1d22172522 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1527,7 +1527,7 @@ gtk_3_HEADERS_INST = \ gtk_3_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj if HAVE_INTROSPECTION # Introspection Items for MSVC @@ -1553,11 +1553,11 @@ GTK_MSVC_GIR_CFLAGS = \ -DINCLUDE_IM_ti_et \ -DINCLUDE_IM_viqr \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \ - -I../.. -I../../gtk -I../../gdk + -I.. -I../gtk -I../gdk INTROSPECTION_INTERMEDIATE_ITEMS = \ - $(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect \ - $(top_builddir)/build/win32/Gtk_3_0_gir_list + $(top_builddir)/win32/Gtk-3.0.gir.msvc.introspect \ + $(top_builddir)/win32/Gtk_3_0_gir_list Gtk_3_0_gir_MSVC_FILES = \ $(introspected_pub_headers) \ @@ -1572,7 +1572,7 @@ Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0 Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS) Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir' -include $(top_srcdir)/build/Makefile.msvc-introspection +include $(top_srcdir)/win32/Makefile.msvc-introspection else INTROSPECTION_INTERMEDIATE_ITEMS = @@ -1580,8 +1580,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS = endif dist-hook: \ - $(top_builddir)/build/win32/vs9/gtk-3.vcproj \ - $(top_builddir)/build/win32/vs9/gtk-3.headers \ + $(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 6e4141f802..cfeb366060 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -96,10 +96,10 @@ gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS) gailutil_3_HEADERS_EXCLUDES = dummy -include $(top_srcdir)/build/Makefile.msvcproj +include $(top_srcdir)/win32/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gailutil-3.vcproj \ - $(top_builddir)/build/win32/vs9/gailutil-3.headers + $(top_builddir)/win32/vs9/gailutil-3.vcproj \ + $(top_builddir)/win32/vs9/gailutil-3.headers -include $(top_srcdir)/git.mk diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am new file mode 100644 index 0000000000..e5c7581288 --- /dev/null +++ b/win32/Makefile-newvs.am @@ -0,0 +1,53 @@ +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) +# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET) + +if MSVC_BASE_NO_TOOLSET_SET +MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 +endif + +if MSVC_NO_TOOLSET_SET +MSVC_TOOLSET = $(MSVC_VER)0 +endif + +%.sln: $(top_builddir)/win32/vs10/Makefile + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: $(top_builddir)/win32/vs10/Makefile + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: $(top_builddir)/win32/vs10/Makefile + if test -e $(top_srcdir)/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: $(top_builddir)/win32/vs10/Makefile + if test -e $(top_srcdir)/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs10/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: $(top_builddir)/win32/vs10/Makefile + if test -e $(top_srcdir)/win32/vs10/$@; then \ + cp $(top_srcdir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/win32/vs10/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ + fi diff --git a/build/win32/Makefile.am b/win32/Makefile.am similarity index 93% rename from build/win32/Makefile.am rename to win32/Makefile.am index c83b78bf45..7235e12542 100644 --- a/build/win32/Makefile.am +++ b/win32/Makefile.am @@ -13,7 +13,7 @@ introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) -$(RM) introspection.body.mak for F in `ls *.msvc.introspect`; do \ case $$F in \ - *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \ + *) cat $(top_builddir)/win32/$$F >>introspection.body.mak \ ;; \ esac; \ done diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection similarity index 68% rename from build/Makefile.msvc-introspection rename to win32/Makefile.msvc-introspection index afbf7c9cad..e393cecd51 100644 --- a/build/Makefile.msvc-introspection +++ b/win32/Makefile.msvc-introspection @@ -79,50 +79,50 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), $($(_gir_name)_MSVC_PROGRAM)),, $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) -$(top_builddir)/build/win32/$(_gir_name)_list: Makefile - rm -f $(top_builddir)/build/win32/$(_gir_name)_list +$(top_builddir)/win32/$(_gir_name)_list: Makefile + rm -f $(top_builddir)/win32/$(_gir_name)_list for F in $(_gir_files_msvc); do \ case $$$$F in \ *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \ - echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \ + echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \ ;; \ esac; \ done -$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile - -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect +$(top_builddir)/win32/$(1).msvc.introspect: Makefile + -$(RM) $(top_builddir)/win32/$(1).msvc.introspect # Assemble the Command to Run g-ir-scanner - echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' -L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' -L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/win32/$(1).msvc.introspect # Finally Assemble the Command to Compile the generated .gir - echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' --includedir=$$$$(@D:\=/) --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' $$$$(@R:\=/).gir \'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' --includedir=$$$$(@D:\=/) --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' $$$$(@R:\=/).gir \'>>$(top_builddir)/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/win32/$(1).msvc.introspect endef $(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff --git a/build/Makefile.msvcproj b/win32/Makefile.msvcproj similarity index 53% rename from build/Makefile.msvcproj rename to win32/Makefile.msvcproj index 166d1d2a4b..cd7e469fb1 100644 --- a/build/Makefile.msvcproj +++ b/win32/Makefile.msvcproj @@ -22,8 +22,8 @@ # 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)/build/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/build/win32/vs9/YourProject.headers +# $(top_builddir)/win32/vs9/YourProject.vcproj \ +# $(top_builddir)/win32/vs9/YourProject.headers # Private functions @@ -54,59 +54,60 @@ _headers_destdir=$(subst /,\\,$(_headers_dest_posix)) define msvcproj-builder -$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(top_builddir)/build/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs14/$(1).vcxproj.filters - -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj - -$(RM) $(top_builddir)/build/win32/vs15/$(1).vcxproj.filters +$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj +$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj +$(top_builddir)/win32/vs9/$(1).vcproj: Makefile + -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs15/$(1).vcxproj.filters + -$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj + -$(RM) $(top_builddir)/win32/vs16/$(1).vcxproj.filters for F in $(_proj_files); do \ case $$$$F in \ $(_proj_filters)) \ ;; \ *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ + echo ' ' >>$(1).sourcefiles && \ + echo ' ' >>$(1).vs10.sourcefiles && \ + echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ ;; \ esac; \ done - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters $(RM) $(1).sourcefiles $(RM) $(1).vs10.sourcefiles $(RM) $(1).vs10.sourcefiles.filters -$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers +$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers -$(top_builddir)/build/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.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)/build/win32/vs9/$(1).headers && \ - echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ + 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 diff --git a/build/win32/README_EGL_MSVC.txt b/win32/README_EGL_MSVC.txt similarity index 100% rename from build/win32/README_EGL_MSVC.txt rename to win32/README_EGL_MSVC.txt diff --git a/build/win32/config-msvc.mak.in b/win32/config-msvc.mak.in similarity index 94% rename from build/win32/config-msvc.mak.in rename to win32/config-msvc.mak.in index 49c077deef..f1339eef8a 100644 --- a/build/win32/config-msvc.mak.in +++ b/win32/config-msvc.mak.in @@ -4,7 +4,7 @@ # Default prefix if not defined !ifndef PREFIX -PREFIX=..\..\..\vs$(VSVER)\$(PLAT) +PREFIX=..\..\vs$(VSVER)\$(PLAT) !endif # Configurable paths to the various interpreters we need @@ -44,15 +44,15 @@ GTK_VERSION = @GTK_VERSION@ GDK_PREPROCESSOR_FLAGS = \ /DG_LOG_USE_STRUCTURED=1 \ /DGDK_COMPILATION \ - /I..\.. \ - /I..\..\gdk \ - /I..\..\gdk\win32 + /I.. \ + /I..\gdk \ + /I..\gdk\win32 GTK_PREPROCESSOR_FLAGS = \ - /I..\..\gtk \ - /I..\..\gdk \ - /I..\..\gdk\win32 \ - /I..\.. \ + /I..\gtk \ + /I..\gdk \ + /I..\gdk\win32 \ + /I.. \ /I$(PREFIX)\include\gdk-pixbuf-2.0 \ /I$(PREFIX)\include\pango-1.0 \ /I$(PREFIX)\include\atk-1.0 \ diff --git a/build/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak similarity index 58% rename from build/win32/create-lists-msvc.mak rename to win32/create-lists-msvc.mak index 8e2467ed44..925cadd2c7 100644 --- a/build/win32/create-lists-msvc.mak +++ b/win32/create-lists-msvc.mak @@ -38,7 +38,7 @@ NULL= !if [call create-lists.bat header resources_sources.mak GDK_RESOURCES] !endif -!if [for %f in (..\..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gdk\resources\glsl\*.glsl) do @call create-lists.bat file resources_sources.mak %f] !endif !if [call create-lists.bat footer resources_sources.mak] @@ -47,31 +47,31 @@ NULL= !if [call create-lists.bat header resources_sources.mak GTK_RESOURCES] !endif -!if [for %f in (..\..\gtk\theme\Adwaita\gtk.css ..\..\gtk\theme\Adwaita\gtk-dark.css ..\..\gtk\theme\Adwaita\gtk-contained.css ..\..\gtk\theme\Adwaita\gtk-contained-dark.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gtk\theme\Adwaita\gtk.css ..\gtk\theme\Adwaita\gtk-dark.css ..\gtk\theme\Adwaita\gtk-contained.css ..\gtk\theme\Adwaita\gtk-contained-dark.css) do @call create-lists.bat file resources_sources.mak %f] !endif -!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] +!if [for %x in (png svg) do @(for %f in (..\gtk\theme\Adwaita\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] !endif -!if [for %f in (..\..\gtk\theme\HighContrast\gtk.css ..\..\gtk\theme\HighContrast\gtk-inverse.css ..\..\gtk\theme\HighContrast\gtk-contained.css ..\..\gtk\theme\HighContrast\gtk-contained-inverse.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gtk\theme\HighContrast\gtk.css ..\gtk\theme\HighContrast\gtk-inverse.css ..\gtk\theme\HighContrast\gtk-contained.css ..\gtk\theme\HighContrast\gtk-contained-inverse.css) do @call create-lists.bat file resources_sources.mak %f] !endif -!if [for %x in (png svg) do @(for %f in (..\..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] +!if [for %x in (png svg) do @(for %f in (..\gtk\theme\HighContrast\assets\*.%x) do @call create-lists.bat file resources_sources.mak %f)] !endif -!if [for %f in (..\..\gtk\theme\win32\gtk-win32-base.css ..\..\gtk\theme\win32\gtk.css) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gtk\theme\win32\gtk-win32-base.css ..\gtk\theme\win32\gtk.css) do @call create-lists.bat file resources_sources.mak %f] !endif -!if [for %f in (..\..\gtk\cursor\*.png ..\..\gtk\gesture\*.symbolic.png ..\..\gtk\ui\*.ui) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gtk\cursor\*.png ..\gtk\gesture\*.symbolic.png ..\gtk\ui\*.ui) do @call create-lists.bat file resources_sources.mak %f] !endif -!if [for %s in (16 22 24 32 48) do @(for %c in (actions status categories) do @(for %f in (..\..\gtk\icons\%sx%s\%c\*.png) do @call create-lists.bat file resources_sources.mak %f))] +!if [for %s in (16 22 24 32 48) do @(for %c in (actions status categories) do @(for %f in (..\gtk\icons\%sx%s\%c\*.png) do @call create-lists.bat file resources_sources.mak %f))] !endif -!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resources_sources.mak %f))] +!if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\gtk\icons\%s\%c\*.svg) do @call create-lists.bat file resources_sources.mak %f))] !endif -!if [for %f in (..\..\gtk\inspector\*.ui ..\..\gtk\inspector\logo.png ..\..\gtk\emoji\emoji.data) do @call create-lists.bat file resources_sources.mak %f] +!if [for %f in (..\gtk\inspector\*.ui ..\gtk\inspector\logo.png ..\gtk\emoji\emoji.data) do @call create-lists.bat file resources_sources.mak %f] !endif !if [call create-lists.bat footer resources_sources.mak] @@ -80,7 +80,7 @@ NULL= !if [call create-lists.bat header resources_sources.mak GTK_DEMO_RESOURCES] !endif -!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\..\demos\gtk-demo ..\..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resources_sources.mak %f] +!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=..\demos\gtk-demo ..\demos\gtk-demo\demo.gresource.xml') do @call create-lists.bat file resources_sources.mak %f] !endif !if [call create-lists.bat footer resources_sources.mak] @@ -89,7 +89,7 @@ NULL= !if [call create-lists.bat header resources_sources.mak ICON_BROWSER_RESOURCES] !endif -!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\..\demos\icon-browser --generate-dependencies ..\..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resources_sources.mak %f] +!if [for /f %f in ('$(GLIB_COMPILE_RESOURCES) --sourcedir=..\demos\icon-browser --generate-dependencies ..\demos\icon-browser\iconbrowser.gresource.xml') do @call create-lists.bat file resources_sources.mak %f] !endif !if [call create-lists.bat footer resources_sources.mak] @@ -98,4 +98,4 @@ NULL= !include resources_sources.mak !if [del /f /q resources_sources.mak] -!endif \ No newline at end of file +!endif diff --git a/build/win32/create-lists.bat b/win32/create-lists.bat similarity index 100% rename from build/win32/create-lists.bat rename to win32/create-lists.bat diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak similarity index 100% rename from build/win32/detectenv-msvc.mak rename to win32/detectenv-msvc.mak diff --git a/build/win32/gen-gdkversionmacros-h.py b/win32/gen-gdkversionmacros-h.py similarity index 94% rename from build/win32/gen-gdkversionmacros-h.py rename to win32/gen-gdkversionmacros-h.py index 07558046dc..89d2a359d5 100644 --- a/build/win32/gen-gdkversionmacros-h.py +++ b/win32/gen-gdkversionmacros-h.py @@ -13,7 +13,7 @@ from replace import replace_multi, replace def main(argv): srcdir = os.path.dirname(__file__) - top_srcdir = os.path.join(srcdir, os.pardir, os.pardir) + top_srcdir = os.path.join(srcdir, os.pardir) parser = argparse.ArgumentParser(description='Generate gdkversionmacros.h') parser.add_argument('--version', help='Version of the package', required=True) diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak new file mode 100644 index 0000000000..10afadea9e --- /dev/null +++ b/win32/generate-msvc.mak @@ -0,0 +1,222 @@ +# NMake Makefile portion for code generation and +# intermediate build directory creation +# Items in here should not need to be edited unless +# one is maintaining the NMake build files. + +!include config-msvc.mak +!include create-lists-msvc.mak + +# Copy the pre-defined gdkconfig.h.[win32|win32_broadway] +!if "$(CFG)" == "release" || "$(CFG)" == "Release" +GDK_OLD_CFG = debug +!else +GDK_OLD_CFG = release +!endif + +!ifdef BROADWAY +GDK_CONFIG = broadway +GDK_DEL_CONFIG = win32 +GDK_CONFIG_TEMPLATE = ..\gdk\gdkconfig.h.win32_broadway +!else +GDK_CONFIG = win32 +GDK_DEL_CONFIG = broadway +GDK_CONFIG_TEMPLATE = ..\gdk\gdkconfig.h.win32 +!endif + +GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers +GDK_RESOURCES_ARGS = ..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\gdk --c-name _gdk --manual-register +GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers +GTK_RESOURCES_ARGS = ..\gtk\gtk.gresource.xml --target=$@ --sourcedir=..\gtk --c-name _gtk --manual-register + +all: \ + ..\config.h \ + ..\gdk\gdkconfig.h \ + ..\gdk\gdkversionmacros.h \ + ..\gdk\gdkmarshalers.h \ + ..\gdk\gdkmarshalers.c \ + ..\gdk\gdkresources.h \ + ..\gdk\gdkresources.c \ + ..\gtk\gtk-win32.rc \ + ..\gtk\libgtk3.manifest \ + ..\gtk\gtkdbusgenerated.h \ + ..\gtk\gtkdbusgenerated.c \ + ..\gtk\gtktypefuncs.inc \ + ..\gtk\gtk.gresource.xml \ + ..\gtk\gtkmarshalers.h \ + ..\gtk\gtkmarshalers.c \ + ..\gtk\gtkresources.h \ + ..\gtk\gtkresources.c \ + ..\demos\gtk-demo\demos.h \ + ..\demos\gtk-demo\demo_resources.c \ + ..\demos\icon-browser\resources.c + +# Copy the pre-defined config.h.win32 and demos.h.win32 +..\config.h: ..\config.h.win32 +..\demos\gtk-demo\demos.h: ..\demos\gtk-demo\demos.h.win32 +..\gtk\gtk-win32.rc: ..\gtk\gtk-win32.rc.body + +..\gdk-$(CFG)-$(GDK_CONFIG)-build: $(GDK_CONFIG_TEMPLATE) + @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build + @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build + @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build + @copy $** $@ + +..\gdk\gdkconfig.h: ..\gdk-$(CFG)-$(GDK_CONFIG)-build + +..\config.h \ +..\gdk\gdkconfig.h \ +..\gtk\gtk-win32.rc \ +..\demos\gtk-demo\demos.h: + @echo Copying $@... + @copy $** $@ + +..\gdk\gdkversionmacros.h: ..\gdk\gdkversionmacros.h.in + @echo Generating $@... + @$(PYTHON) gen-gdkversionmacros-h.py --version=$(GTK_VERSION) + +..\gdk\gdkmarshalers.h: ..\gdk\gdkmarshalers.list + @echo Generating $@... + @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --header $** > $@.tmp + @move $@.tmp $@ + +..\gdk\gdkmarshalers.c: ..\gdk\gdkmarshalers.list + @echo Generating $@... + @$(PYTHON) $(GLIB_GENMARSHAL) $(GDK_MARSHALERS_FLAGS) --body $** > $@.tmp + @move $@.tmp $@ + +..\gdk\gdk.gresource.xml: $(GDK_RESOURCES) + @echo Generating $@... + @echo ^ >$@ + @echo ^ >> $@ + @echo ^ >> $@ + @for %%f in (..\gdk\resources\glsl\*.glsl) do @echo ^resources/glsl/%%~nxf^ >> $@ + @echo ^ >> $@ + @echo ^ >> $@ + +..\gdk\gdkresources.h: ..\gdk\gdk.gresource.xml + @echo Generating $@... + @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) + @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) + @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) + @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-header + +..\gdk\gdkresources.c: ..\gdk\gdk.gresource.xml $(GDK_RESOURCES) + @echo Generating $@... + @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) + @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) + @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) + @$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source + +..\gtk\libgtk3.manifest: ..\gtk\libgtk3.manifest.in + @echo Generating $@... + @$(PYTHON) replace.py \ + --action=replace-var \ + --input=$** --output=$@ \ + --var=EXE_MANIFEST_ARCHITECTURE \ + --outstring=* + +..\gtk\gtkdbusgenerated.h ..\gtk\gtkdbusgenerated.c: ..\gtk\gtkdbusinterfaces.xml + @echo Generating GTK DBus sources... + @$(PYTHON) $(PREFIX)\bin\gdbus-codegen \ + --interface-prefix org.Gtk. --c-namespace _Gtk \ + --generate-c-code gtkdbusgenerated $** \ + --output-directory $(@D) + +..\gtk\gtktypefuncs.inc: ..\gtk\gentypefuncs.py + @echo Generating $@... + @echo #undef GTK_COMPILATION > $(@R).preproc.c + @echo #include "gtkx.h" >> $(@R).preproc.c + @cl /EP $(GTK_PREPROCESSOR_FLAGS) $(@R).preproc.c > $(@R).combined.c + @$(PYTHON) $** $@ $(@R).combined.c + @del $(@R).preproc.c $(@R).combined.c + +..\gtk\gtk.gresource.xml: $(GTK_RESOURCES) + @echo Generating $@... + @echo ^> $@ + @echo ^>> $@ + @echo ^>> $@ + @echo ^theme/Adwaita/gtk.css^>> $@ + @echo ^theme/Adwaita/gtk-dark.css^>> $@ + @echo ^theme/Adwaita/gtk-contained.css^>> $@ + @echo ^theme/Adwaita/gtk-contained-dark.css^>> $@ + @for %%f in (..\gtk\theme\Adwaita\assets\*.png) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ + @for %%f in (..\gtk\theme\Adwaita\assets\*.svg) do @echo ^theme/Adwaita/assets/%%~nxf^>> $@ + @echo ^theme/HighContrast/gtk.css^>> $@ + @echo ^theme/HighContrast/gtk-inverse.css^>> $@ + @echo ^theme/HighContrast/gtk-contained.css^>> $@ + @echo ^theme/HighContrast/gtk-contained-inverse.css^>> $@ + @for %%f in (..\gtk\theme\HighContrast\assets\*.png) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ + @for %%f in (..\gtk\theme\HighContrast\assets\*.svg) do @echo ^theme/HighContrast/assets/%%~nxf^>> $@ + @echo ^theme/win32/gtk-win32-base.css^>> $@ + @echo ^theme/win32/gtk.css^>> $@ + @for %%f in (..\gtk\cursor\*.png) do @echo ^cursor/%%~nxf^>> $@ + @for %%f in (..\gtk\gesture\*.symbolic.png) do @echo ^gesture/%%~nxf^>> $@ + @for %%f in (..\gtk\ui\*.ui) do @echo ^ui/%%~nxf^>> $@ + @for %%s in (16 22 24 32 48) do @(for %%c in (actions status categories) do @(for %%f in (..\gtk\icons\%%sx%%s\%%c\*.png) do @echo ^icons/%%sx%%s/%%c/%%~nxf^>> $@)) + @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\gtk\icons\%%s\%%c\*.svg) do @echo ^icons/%%s/%%c/%%~nxf^>> $@)) + @for %%f in (..\gtk\inspector\*.ui) do @echo ^inspector/%%~nxf^>> $@ + @echo ^inspector/logo.png^>> $@ + @echo ^emoji/emoji.data^>> $@ + @echo ^>> $@ + @echo ^>> $@ + +..\gtk\gtkresources.h: ..\gtk\gtk.gresource.xml + @echo Generating $@... + @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) + @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) + @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) + @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-header + +..\gtk\gtkresources.c: ..\gtk\gtk.gresource.xml $(GTK_RESOURCES) + @echo Generating $@... + @if not "$(XMLLINT)" == "" set XMLLINT=$(XMLLINT) + @if not "$(JSON_GLIB_FORMAT)" == "" set JSON_GLIB_FORMAT=$(JSON_GLIB_FORMAT) + @if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA) + @$(GLIB_COMPILE_RESOURCES) $(GTK_RESOURCES_ARGS) --generate-source + +..\gtk\gtkmarshalers.h: ..\gtk\gtkmarshalers.list + @echo Generating $@... + @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --header $** > $@.tmp + @move $@.tmp $@ + +..\gtk\gtkmarshalers.c: ..\gtk\gtkmarshalers.list + @echo Generating $@... + @echo #undef G_ENABLE_DEBUG> $@.tmp + @$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp + @move $@.tmp $@ + +..\demos\gtk-demo\demo_resources.c: ..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES) + @echo Generating $@... + @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml + +..\demos\icon-browser\resources.c: ..\demos\icon-browser\iconbrowser.gresource.xml $(ICON_BROWSER_RESOURCES) + @echo Generating $@... + @$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml + +# Remove the generated files +clean: + @-del /f /q ..\demos\icon-browser\resources.c + @-del /f /q ..\demos\gtk-demo\demo_resources.c + @-del /f /q ..\demos\gtk-demo\demos.h + @-del /f /q ..\gtk\gtkresources.c + @-del /f /q ..\gtk\gtkresources.h + @-del /f /q ..\gtk\gtkmarshalers.c + @-del /f /q ..\gtk\gtkmarshalers.h + @-del /f /q ..\gtk\gtk.gresource.xml + @-del /f /q ..\gtk\gtktypefuncs.inc + @-del /f /q ..\gtk\gtkdbusgenerated.c + @-del /f /q ..\gtk\gtkdbusgenerated.h + @-del /f /q ..\gtk\libgtk3.manifest + @-del /f /q ..\gtk\gtk-win32.rc + @-del /f /q ..\gdk\gdkresources.c + @-del /f /q ..\gdk\gdkresources.h + @-del /f /q ..\gdk\gdk.gresource.xml + @-del /f /q ..\gdk\gdkmarshalers.c + @-del /f /q ..\gdk\gdkmarshalers.h + @-del /f /q ..\gdk\gdkversionmacros.h + @-del /f /q ..\gdk\gdkconfig.h + @if exist ..\gdk-$(CFG)-$(GDK_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_CONFIG)-build + @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_DEL_CONFIG)-build + @if exist ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build del ..\gdk-$(GDK_OLD_CFG)-$(GDK_CONFIG)-build + @if exist ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build del ..\gdk-$(CFG)-$(GDK_DEL_CONFIG)-build + @-del /f /q ..\config.h diff --git a/build/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak similarity index 100% rename from build/win32/gtk-introspection-msvc.mak rename to win32/gtk-introspection-msvc.mak diff --git a/build/win32/gtkpc.py b/win32/gtkpc.py similarity index 100% rename from build/win32/gtkpc.py rename to win32/gtkpc.py diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak similarity index 98% rename from build/win32/introspection-msvc.mak rename to win32/introspection-msvc.mak index 8739844210..26501f5251 100644 --- a/build/win32/introspection-msvc.mak +++ b/win32/introspection-msvc.mak @@ -8,7 +8,7 @@ # Change or pass in or set the following to suit your environment !if "$(PREFIX)" == "" -PREFIX = ..\..\..\vs$(VSVER)\$(PLAT) +PREFIX = ..\..\vs$(VSVER)\$(PLAT) !endif !if ![setlocal] && \ diff --git a/build/win32/pc_base.py b/win32/pc_base.py similarity index 98% rename from build/win32/pc_base.py rename to win32/pc_base.py index 587ba83d19..25d6e42c99 100644 --- a/build/win32/pc_base.py +++ b/win32/pc_base.py @@ -23,7 +23,7 @@ class BasePCItems: self.libdir = '' self.prefix = '' self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..\\..' + self.top_srcdir = os.path.join(self.srcdir, os.pardir) self.version = '' def setup(self, argv, parser=None): diff --git a/build/win32/replace.py b/win32/replace.py similarity index 100% rename from build/win32/replace.py rename to win32/replace.py diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am similarity index 83% rename from build/win32/vs10/Makefile.am rename to win32/vs10/Makefile.am index c17ee7fb70..1117c03e07 100644 --- a/build/win32/vs10/Makefile.am +++ b/win32/vs10/Makefile.am @@ -73,12 +73,13 @@ EXTRA_DIST += \ DISTCLEANFILES = \ $(GENERATED_ITEMS) -gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin $(MSVC10_HEADERS_LISTS) - -$(RM) $(top_builddir)/build/win32/vs11/gtk3-install.props - -$(RM) $(top_builddir)/build/win32/vs12/gtk3-install.props - -$(RM) $(top_builddir)/build/win32/vs14/gtk3-install.props - -$(RM) $(top_builddir)/build/win32/vs15/gtk3-install.props - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@ +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/build/win32/vs10/README.txt b/win32/vs10/README.txt similarity index 100% rename from build/win32/vs10/README.txt rename to win32/vs10/README.txt diff --git a/build/win32/vs10/broadwayd.vcxproj.filtersin b/win32/vs10/broadwayd.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/broadwayd.vcxproj.filtersin rename to win32/vs10/broadwayd.vcxproj.filtersin diff --git a/build/win32/vs10/broadwayd.vcxprojin b/win32/vs10/broadwayd.vcxprojin similarity index 94% rename from build/win32/vs10/broadwayd.vcxprojin rename to win32/vs10/broadwayd.vcxprojin index 163e9c5fa0..ea2cc36e53 100644 --- a/build/win32/vs10/broadwayd.vcxprojin +++ b/win32/vs10/broadwayd.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) true $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) true $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gailutil-3.vcxproj.filtersin b/win32/vs10/gailutil-3.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gailutil-3.vcxproj.filtersin rename to win32/vs10/gailutil-3.vcxproj.filtersin diff --git a/build/win32/vs10/gailutil-3.vcxprojin b/win32/vs10/gailutil-3.vcxprojin similarity index 91% rename from build/win32/vs10/gailutil-3.vcxprojin rename to win32/vs10/gailutil-3.vcxprojin index 9652cedadc..ff09df22d2 100644 --- a/build/win32/vs10/gailutil-3.vcxprojin +++ b/win32/vs10/gailutil-3.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -88,7 +88,7 @@ atk-1.0.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def + ..\..\libgail-util\gailutil.def $(TargetDir)$(ProjectName).0.lib true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb @@ -100,7 +100,7 @@ MaxSpeed true - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -112,7 +112,7 @@ atk-1.0.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def + ..\..\libgail-util\gailutil.def $(TargetDir)$(ProjectName).0.lib true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb @@ -125,7 +125,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -138,7 +138,7 @@ atk-1.0.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def + ..\..\libgail-util\gailutil.def $(TargetDir)$(ProjectName).0.lib true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb @@ -148,7 +148,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) MultiThreadedDLL @@ -159,7 +159,7 @@ atk-1.0.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - ..\..\..\libgail-util\gailutil.def + ..\..\libgail-util\gailutil.def $(TargetDir)$(ProjectName).0.lib true $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb diff --git a/build/win32/vs10/gdk-3.vcxproj.filtersin b/win32/vs10/gdk-3.vcxproj.filtersin similarity index 81% rename from build/win32/vs10/gdk-3.vcxproj.filtersin rename to win32/vs10/gdk-3.vcxproj.filtersin index b618b922d4..edb543dba8 100644 --- a/build/win32/vs10/gdk-3.vcxproj.filtersin +++ b/win32/vs10/gdk-3.vcxproj.filtersin @@ -15,10 +15,10 @@ - Resource Files + Resource Files #include "gdk-3.vs10.sourcefiles.filters" - Source Files + Source Files diff --git a/build/win32/vs10/gdk-3.vcxprojin b/win32/vs10/gdk-3.vcxprojin similarity index 93% rename from build/win32/vs10/gdk-3.vcxprojin rename to win32/vs10/gdk-3.vcxprojin index 1de4b9a4a7..ef8ba4db17 100644 --- a/build/win32/vs10/gdk-3.vcxprojin +++ b/win32/vs10/gdk-3.vcxprojin @@ -133,7 +133,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -156,7 +156,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -178,7 +178,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -200,7 +200,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -223,7 +223,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -246,7 +246,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -290,7 +290,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -311,11 +311,11 @@ - + #include "gdk-3.vs10.sourcefiles" - + diff --git a/build/win32/vs10/gdk3-broadway.vcxproj.filtersin b/win32/vs10/gdk3-broadway.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gdk3-broadway.vcxproj.filtersin rename to win32/vs10/gdk3-broadway.vcxproj.filtersin diff --git a/build/win32/vs10/gdk3-broadway.vcxprojin b/win32/vs10/gdk3-broadway.vcxprojin similarity index 92% rename from build/win32/vs10/gdk3-broadway.vcxprojin rename to win32/vs10/gdk3-broadway.vcxprojin index d14fe37ace..d1b4817b82 100644 --- a/build/win32/vs10/gdk3-broadway.vcxprojin +++ b/win32/vs10/gdk3-broadway.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories) $(GdkDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gdk3-win32.vcxproj.filtersin b/win32/vs10/gdk3-win32.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gdk3-win32.vcxproj.filtersin rename to win32/vs10/gdk3-win32.vcxproj.filtersin diff --git a/build/win32/vs10/gdk3-win32.vcxprojin b/win32/vs10/gdk3-win32.vcxprojin similarity index 92% rename from build/win32/vs10/gdk3-win32.vcxprojin rename to win32/vs10/gdk3-win32.vcxprojin index c5f4d48623..8ad851d1c4 100644 --- a/build/win32/vs10/gdk3-win32.vcxprojin +++ b/win32/vs10/gdk3-win32.vcxprojin @@ -69,7 +69,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -82,7 +82,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL @@ -94,7 +94,7 @@ Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gtk+.sln b/win32/vs10/gtk+.sln similarity index 100% rename from build/win32/vs10/gtk+.sln rename to win32/vs10/gtk+.sln diff --git a/win32/vs10/gtk-3.vcxproj.filtersin b/win32/vs10/gtk-3.vcxproj.filtersin new file mode 100644 index 0000000000..8004f7e618 --- /dev/null +++ b/win32/vs10/gtk-3.vcxproj.filtersin @@ -0,0 +1,41 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + Resource Files + + +#include "gtk-3.vs10.sourcefiles.filters" + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + + diff --git a/build/win32/vs10/gtk-3.vcxprojin b/win32/vs10/gtk-3.vcxprojin similarity index 84% rename from build/win32/vs10/gtk-3.vcxprojin rename to win32/vs10/gtk-3.vcxprojin index a528a4383c..d617cb2296 100644 --- a/build/win32/vs10/gtk-3.vcxprojin +++ b/win32/vs10/gtk-3.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -97,7 +97,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -142,7 +142,7 @@ - ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + ..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -163,28 +163,28 @@ - + #include "gtk-3.vs10.sourcefiles" - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/win32/vs10/gtk-builder-tool.vcxproj similarity index 99% rename from build/win32/vs10/gtk-builder-tool.vcxproj rename to win32/vs10/gtk-builder-tool.vcxproj index 19d2182a96..a60b5e37eb 100644 --- a/build/win32/vs10/gtk-builder-tool.vcxproj +++ b/win32/vs10/gtk-builder-tool.vcxproj @@ -163,7 +163,7 @@ - + diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj.filters b/win32/vs10/gtk-builder-tool.vcxproj.filters similarity index 89% rename from build/win32/vs10/gtk-builder-tool.vcxproj.filters rename to win32/vs10/gtk-builder-tool.vcxproj.filters index 8b19c8b0f3..e88646b264 100644 --- a/build/win32/vs10/gtk-builder-tool.vcxproj.filters +++ b/win32/vs10/gtk-builder-tool.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/win32/vs10/gtk-encode-symbolic-svg.vcxproj similarity index 94% rename from build/win32/vs10/gtk-encode-symbolic-svg.vcxproj rename to win32/vs10/gtk-encode-symbolic-svg.vcxproj index 4d9858a3fa..64d572035e 100644 --- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ MaxSpeed - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -120,7 +120,7 @@ Disabled - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ MaxSpeed - ..\..\..\gdk;%(AdditionalIncludeDirectories) + ..\..\gdk;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -163,7 +163,7 @@ - + diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters b/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters similarity index 89% rename from build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters rename to win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters index 22a3155d84..3377263529 100644 --- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters +++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/win32/vs10/gtk-query-settings.vcxproj similarity index 99% rename from build/win32/vs10/gtk-query-settings.vcxproj rename to win32/vs10/gtk-query-settings.vcxproj index 94f072445e..5bd517bccb 100644 --- a/build/win32/vs10/gtk-query-settings.vcxproj +++ b/win32/vs10/gtk-query-settings.vcxproj @@ -163,7 +163,7 @@ - + diff --git a/build/win32/vs10/gtk-query-settings.vcxproj.filters b/win32/vs10/gtk-query-settings.vcxproj.filters similarity index 89% rename from build/win32/vs10/gtk-query-settings.vcxproj.filters rename to win32/vs10/gtk-query-settings.vcxproj.filters index 42804c1aee..6e14aacf20 100644 --- a/build/win32/vs10/gtk-query-settings.vcxproj.filters +++ b/win32/vs10/gtk-query-settings.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/win32/vs10/gtk-update-icon-cache.vcxproj similarity index 99% rename from build/win32/vs10/gtk-update-icon-cache.vcxproj rename to win32/vs10/gtk-update-icon-cache.vcxproj index 6b2389b0c9..103671e99f 100644 --- a/build/win32/vs10/gtk-update-icon-cache.vcxproj +++ b/win32/vs10/gtk-update-icon-cache.vcxproj @@ -163,7 +163,7 @@ - + diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters b/win32/vs10/gtk-update-icon-cache.vcxproj.filters similarity index 89% rename from build/win32/vs10/gtk-update-icon-cache.vcxproj.filters rename to win32/vs10/gtk-update-icon-cache.vcxproj.filters index 24d654bd72..f62b142f16 100644 --- a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters +++ b/win32/vs10/gtk-update-icon-cache.vcxproj.filters @@ -15,6 +15,6 @@ - Sources + Sources diff --git a/build/win32/vs10/gtk3-build-defines.props b/win32/vs10/gtk3-build-defines.props similarity index 91% rename from build/win32/vs10/gtk3-build-defines.props rename to win32/vs10/gtk3-build-defines.props index 6db0f72ad9..24f6a2dee5 100644 --- a/build/win32/vs10/gtk3-build-defines.props +++ b/win32/vs10/gtk3-build-defines.props @@ -26,7 +26,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall - ..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + ..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions) msvc_recommended_pragmas.h;%(ForcedIncludeFiles) true diff --git a/build/win32/vs10/gtk3-copy-gdk-broadway.props b/win32/vs10/gtk3-copy-gdk-broadway.props similarity index 100% rename from build/win32/vs10/gtk3-copy-gdk-broadway.props rename to win32/vs10/gtk3-copy-gdk-broadway.props diff --git a/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/win32/vs10/gtk3-demo-application.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gtk3-demo-application.vcxproj.filtersin rename to win32/vs10/gtk3-demo-application.vcxproj.filtersin diff --git a/build/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin similarity index 100% rename from build/win32/vs10/gtk3-demo-application.vcxprojin rename to win32/vs10/gtk3-demo-application.vcxprojin diff --git a/build/win32/vs10/gtk3-demo.vcxproj.filtersin b/win32/vs10/gtk3-demo.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gtk3-demo.vcxproj.filtersin rename to win32/vs10/gtk3-demo.vcxproj.filtersin diff --git a/build/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin similarity index 94% rename from build/win32/vs10/gtk3-demo.vcxprojin rename to win32/vs10/gtk3-demo.vcxprojin index ef92af842d..7088d43f9e 100644 --- a/build/win32/vs10/gtk3-demo.vcxprojin +++ b/win32/vs10/gtk3-demo.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -97,7 +97,7 @@ - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL @@ -121,7 +121,7 @@ Disabled - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ - ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + ..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories) $(GtkPrefixDefine);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/win32/vs10/gtk3-gen-srcs.props similarity index 69% rename from build/win32/vs10/gtk3-gen-srcs.props rename to win32/vs10/gtk3-gen-srcs.props index 6a5edb7ce4..cd298f89fe 100644 --- a/build/win32/vs10/gtk3-gen-srcs.props +++ b/win32/vs10/gtk3-gen-srcs.props @@ -7,9 +7,9 @@ cd .. set VCInstallDir=$(VCInstallDir) nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot) - ..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c - ..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c - ..\..\..\demos\gtk-demo\demos.h + ..\..\config.h;..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\gdk\gdkmarshalers.h;..\..\gdk\gdkmarshalers.c;..\..\gdk\gdkresources.h;..\..\gdk\gdkresources.c + ..\..\gtk\gtk-win32.rc;..\..\gtk\libgtk3.manifest;..\..\gtk\gtkdbusgenerated.h;..\..\gtk\gtkdbusgenerated.c + ..\..\demos\gtk-demo\demos.h <_PropertySheetDisplayName>gtk3gensrcsprops diff --git a/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/win32/vs10/gtk3-icon-browser.vcxproj.filtersin similarity index 100% rename from build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin rename to win32/vs10/gtk3-icon-browser.vcxproj.filtersin diff --git a/build/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin similarity index 94% rename from build/win32/vs10/gtk3-icon-browser.vcxprojin rename to win32/vs10/gtk3-icon-browser.vcxprojin index f705ef7e82..df11ee027c 100644 --- a/build/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/win32/vs10/gtk3-icon-browser.vcxprojin @@ -75,7 +75,7 @@ Disabled - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -94,7 +94,7 @@ MaxSpeed - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL @@ -118,7 +118,7 @@ Disabled - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -140,7 +140,7 @@ MaxSpeed - ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + ..\..\demos\icon-browser;%(AdditionalIncludeDirectories) true %(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/gtk3-ignore-broadway.props b/win32/vs10/gtk3-ignore-broadway.props similarity index 100% rename from build/win32/vs10/gtk3-ignore-broadway.props rename to win32/vs10/gtk3-ignore-broadway.props diff --git a/build/win32/vs10/gtk3-install.propsin b/win32/vs10/gtk3-install.propsin similarity index 93% rename from build/win32/vs10/gtk3-install.propsin rename to win32/vs10/gtk3-install.propsin index b8f452f7f8..5f8d65d895 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/win32/vs10/gtk3-install.propsin @@ -121,7 +121,7 @@ copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig echo off mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated -copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk +copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk #include "gdk-3.vs10.headers" #include "gdk3-win32.vs10.headers" @@ -133,17 +133,17 @@ 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)) +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 ..\..\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 +copy ..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway #include "gdk3-broadway.vs10.headers" diff --git a/build/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj similarity index 99% rename from build/win32/vs10/gtk3-install.vcxproj rename to win32/vs10/gtk3-install.vcxproj index d4ac1c173f..290efb11a7 100644 --- a/build/win32/vs10/gtk3-install.vcxproj +++ b/win32/vs10/gtk3-install.vcxproj @@ -155,7 +155,7 @@ - + Installing Build Results... $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) diff --git a/build/win32/vs10/gtk3-install.vcxproj.filters b/win32/vs10/gtk3-install.vcxproj.filters similarity index 84% rename from build/win32/vs10/gtk3-install.vcxproj.filters rename to win32/vs10/gtk3-install.vcxproj.filters index c75e9b3cc0..6be701aa89 100644 --- a/build/win32/vs10/gtk3-install.vcxproj.filters +++ b/win32/vs10/gtk3-install.vcxproj.filters @@ -7,7 +7,7 @@ - Resource Files + Resource Files Resource Files diff --git a/build/win32/vs10/gtk3-introspect.vcxproj b/win32/vs10/gtk3-introspect.vcxproj similarity index 100% rename from build/win32/vs10/gtk3-introspect.vcxproj rename to win32/vs10/gtk3-introspect.vcxproj diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/win32/vs10/gtk3-prebuild.vcxproj similarity index 100% rename from build/win32/vs10/gtk3-prebuild.vcxproj rename to win32/vs10/gtk3-prebuild.vcxproj diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/win32/vs10/gtk3-version-paths.props.in similarity index 95% rename from build/win32/vs10/gtk3-version-paths.props.in rename to win32/vs10/gtk3-version-paths.props.in index 9ad33fdb42..59d59dbda6 100644 --- a/build/win32/vs10/gtk3-version-paths.props.in +++ b/win32/vs10/gtk3-version-paths.props.in @@ -2,8 +2,8 @@ 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - ..\..\..\..\vs$(VSVer)\$(Platform) + $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) + ..\..\..\vs$(VSVer)\$(Platform) 3.0 @GTK_VERSION@ lib diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am similarity index 96% rename from build/win32/vs11/Makefile.am rename to win32/vs11/Makefile.am index 7cc4fcd4f5..454d273267 100644 --- a/build/win32/vs11/Makefile.am +++ b/win32/vs11/Makefile.am @@ -46,6 +46,6 @@ MSVC_VER = 11 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2012 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am similarity index 96% rename from build/win32/vs12/Makefile.am rename to win32/vs12/Makefile.am index 6485e38dcf..ac45c949a5 100644 --- a/build/win32/vs12/Makefile.am +++ b/win32/vs12/Makefile.am @@ -46,6 +46,6 @@ MSVC_VER = 12 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 2013 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am similarity index 96% rename from build/win32/vs14/Makefile.am rename to win32/vs14/Makefile.am index ae1137e76d..2db9336ea0 100644 --- a/build/win32/vs14/Makefile.am +++ b/win32/vs14/Makefile.am @@ -46,6 +46,6 @@ MSVC_VER = 14 MSVC_FORMAT_VER = 12 MSVC_VER_LONG = 14 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk diff --git a/build/win32/vs15/Makefile.am b/win32/vs15/Makefile.am similarity index 96% rename from build/win32/vs15/Makefile.am rename to win32/vs15/Makefile.am index a7a033a153..c9f0429f13 100644 --- a/build/win32/vs15/Makefile.am +++ b/win32/vs15/Makefile.am @@ -47,6 +47,6 @@ MSVC_VER_LONG = 15 MSVC_TOOLSET = 141 MSVC_FORMAT_VER = 12 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk diff --git a/build/win32/vs16/Makefile.am b/win32/vs16/Makefile.am similarity index 96% rename from build/win32/vs16/Makefile.am rename to win32/vs16/Makefile.am index 989562e2bf..89f2b2d4d7 100644 --- a/build/win32/vs16/Makefile.am +++ b/win32/vs16/Makefile.am @@ -47,6 +47,6 @@ MSVC_VER_LONG = 16 MSVC_TOOLSET = 142 MSVC_FORMAT_VER = 12 -include $(top_srcdir)/build/Makefile-newvs.am +include $(top_srcdir)/win32/Makefile-newvs.am -include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am similarity index 87% rename from build/win32/vs9/Makefile.am rename to win32/vs9/Makefile.am index 39637f3a6d..f0dd87b076 100644 --- a/build/win32/vs9/Makefile.am +++ b/win32/vs9/Makefile.am @@ -47,8 +47,8 @@ EXTRA_DIST += \ gtk3-version-paths.vsprops.in \ $(GENERATED_ITEMS) -gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin $(MSVC_HEADERS_LISTS) - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin >$@ +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) diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt similarity index 100% rename from build/win32/vs9/README.txt rename to win32/vs9/README.txt diff --git a/build/win32/vs9/broadwayd.vcprojin b/win32/vs9/broadwayd.vcprojin similarity index 93% rename from build/win32/vs9/broadwayd.vcprojin rename to win32/vs9/broadwayd.vcprojin index e959a07586..ebe2658c26 100644 --- a/build/win32/vs9/broadwayd.vcprojin +++ b/win32/vs9/broadwayd.vcprojin @@ -31,7 +31,7 @@ - + #include "gdk-3.sourcefiles" - + diff --git a/build/win32/vs9/gdk3-broadway.vcprojin b/win32/vs9/gdk3-broadway.vcprojin similarity index 91% rename from build/win32/vs9/gdk3-broadway.vcprojin rename to win32/vs9/gdk3-broadway.vcprojin index 4fb565fd1b..d66af2f26c 100644 --- a/build/win32/vs9/gdk3-broadway.vcprojin +++ b/win32/vs9/gdk3-broadway.vcprojin @@ -31,7 +31,7 @@ - - + + #include "gtk-3.sourcefiles" - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk-builder-tool.vcproj b/win32/vs9/gtk-builder-tool.vcproj similarity index 98% rename from build/win32/vs9/gtk-builder-tool.vcproj rename to win32/vs9/gtk-builder-tool.vcproj index 543f00ff25..4de2b7dc69 100644 --- a/build/win32/vs9/gtk-builder-tool.vcproj +++ b/win32/vs9/gtk-builder-tool.vcproj @@ -152,7 +152,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - + - + - + - + diff --git a/build/win32/vs9/gtk3-icon-browser.vcprojin b/win32/vs9/gtk3-icon-browser.vcprojin similarity index 92% rename from build/win32/vs9/gtk3-icon-browser.vcprojin rename to win32/vs9/gtk3-icon-browser.vcprojin index 08580b5670..42bbd67fae 100644 --- a/build/win32/vs9/gtk3-icon-browser.vcprojin +++ b/win32/vs9/gtk3-icon-browser.vcprojin @@ -31,7 +31,7 @@ - +