[gtk/move-msvc-projects] Visual Studio projects: move projects to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/move-msvc-projects] Visual Studio projects: move projects to win32/
- Date: Thu, 16 Jul 2020 10:57:56 +0000 (UTC)
commit 1feb169bfa29a77e7b74d1147182c6973de6c9c6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jul 16 17:11:19 2020 +0800
Visual Studio projects: move projects to win32/
This will simplify our source tree a bit
Makefile.am | 2 +-
build/Makefile-newvs.am | 53 -----
build/Makefile.am | 5 -
build/win32/generate-msvc.mak | 222 ---------------------
build/win32/vs10/gtk-3.vcxproj.filtersin | 41 ----
build/win32/vs10/gtk-builder-tool.vcxproj.filters | 20 --
.../vs10/gtk-encode-symbolic-svg.vcxproj.filters | 20 --
.../win32/vs10/gtk-query-settings.vcxproj.filters | 20 --
configure.ac | 23 +--
demos/gtk-demo/Makefile.am | 6 +-
demos/icon-browser/Makefile.am | 4 +-
gdk/Makefile.am | 18 +-
gdk/broadway/Makefile.am | 8 +-
gdk/win32/Makefile.am | 6 +-
gtk/Makefile.am | 14 +-
libgail-util/Makefile.am | 6 +-
win32/Makefile-newvs.am | 53 +++++
{build/win32 => win32}/Makefile.am | 2 +-
{build => win32}/Makefile.msvc-introspection | 66 +++---
{build => win32}/Makefile.msvcproj | 67 ++++---
{build/win32 => win32}/README_EGL_MSVC.txt | 0
{build/win32 => win32}/config-msvc.mak.in | 16 +-
{build/win32 => win32}/create-lists-msvc.mak | 26 +--
{build/win32 => win32}/create-lists.bat | 0
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/gen-gdkversionmacros-h.py | 2 +-
win32/generate-msvc.mak | 222 +++++++++++++++++++++
{build/win32 => win32}/gtk-introspection-msvc.mak | 0
{build/win32 => win32}/gtkpc.py | 0
{build/win32 => win32}/introspection-msvc.mak | 2 +-
{build/win32 => win32}/pc_base.py | 2 +-
{build/win32 => win32}/replace.py | 0
{build/win32 => win32}/vs10/Makefile.am | 13 +-
{build/win32 => win32}/vs10/README.txt | 0
.../vs10/broadwayd.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/broadwayd.vcxprojin | 8 +-
.../vs10/gailutil-3.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/gailutil-3.vcxprojin | 16 +-
.../win32 => win32}/vs10/gdk-3.vcxproj.filtersin | 4 +-
{build/win32 => win32}/vs10/gdk-3.vcxprojin | 20 +-
.../vs10/gdk3-broadway.vcxproj.filtersin | 0
.../win32 => win32}/vs10/gdk3-broadway.vcxprojin | 8 +-
.../vs10/gdk3-win32.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/gdk3-win32.vcxprojin | 8 +-
{build/win32 => win32}/vs10/gtk+.sln | 0
win32/vs10/gtk-3.vcxproj.filtersin | 41 ++++
{build/win32 => win32}/vs10/gtk-3.vcxprojin | 42 ++--
.../win32 => win32}/vs10/gtk-builder-tool.vcxproj | 2 +-
win32/vs10/gtk-builder-tool.vcxproj.filters | 20 ++
.../vs10/gtk-encode-symbolic-svg.vcxproj | 10 +-
win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters | 20 ++
.../vs10/gtk-query-settings.vcxproj | 2 +-
.../vs10/gtk-query-settings.vcxproj.filters | 2 +-
.../vs10/gtk-update-icon-cache.vcxproj | 2 +-
win32/vs10/gtk-update-icon-cache.vcxproj.filters | 20 ++
.../win32 => win32}/vs10/gtk3-build-defines.props | 2 +-
.../vs10/gtk3-copy-gdk-broadway.props | 0
.../vs10/gtk3-demo-application.vcxproj.filtersin | 0
.../vs10/gtk3-demo-application.vcxprojin | 0
.../vs10/gtk3-demo.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/gtk3-demo.vcxprojin | 8 +-
{build/win32 => win32}/vs10/gtk3-gen-srcs.props | 6 +-
.../vs10/gtk3-icon-browser.vcxproj.filtersin | 0
.../vs10/gtk3-icon-browser.vcxprojin | 8 +-
.../vs10/gtk3-ignore-broadway.props | 0
{build/win32 => win32}/vs10/gtk3-install.propsin | 16 +-
{build/win32 => win32}/vs10/gtk3-install.vcxproj | 2 +-
.../vs10/gtk3-install.vcxproj.filters | 2 +-
.../win32 => win32}/vs10/gtk3-introspect.vcxproj | 0
{build/win32 => win32}/vs10/gtk3-prebuild.vcxproj | 0
.../vs10/gtk3-version-paths.props.in | 4 +-
{build/win32 => win32}/vs11/Makefile.am | 2 +-
{build/win32 => win32}/vs12/Makefile.am | 2 +-
{build/win32 => win32}/vs14/Makefile.am | 2 +-
{build/win32 => win32}/vs15/Makefile.am | 2 +-
{build/win32 => win32}/vs16/Makefile.am | 2 +-
{build/win32 => win32}/vs9/Makefile.am | 4 +-
{build/win32 => win32}/vs9/README.txt | 0
{build/win32 => win32}/vs9/broadwayd.vcprojin | 8 +-
{build/win32 => win32}/vs9/gailutil-3.vcprojin | 16 +-
{build/win32 => win32}/vs9/gdk-3.vcprojin | 20 +-
{build/win32 => win32}/vs9/gdk3-broadway.vcprojin | 8 +-
{build/win32 => win32}/vs9/gdk3-win32.vcprojin | 8 +-
{build/win32 => win32}/vs9/gtk+.sln | 0
{build/win32 => win32}/vs9/gtk-3.vcprojin | 42 ++--
{build/win32 => win32}/vs9/gtk-builder-tool.vcproj | 2 +-
.../vs9/gtk-encode-symbolic-svg.vcproj | 10 +-
.../win32 => win32}/vs9/gtk-query-settings.vcproj | 2 +-
.../vs9/gtk-update-icon-cache.vcproj | 2 +-
.../win32 => win32}/vs9/gtk3-build-defines.vsprops | 2 +-
.../vs9/gtk3-copy-gdk-broadway.vsprops | 0
.../vs9/gtk3-demo-application.vcprojin | 0
{build/win32 => win32}/vs9/gtk3-demo.vcprojin | 8 +-
{build/win32 => win32}/vs9/gtk3-gen-srcs.vsprops | 6 +-
.../win32 => win32}/vs9/gtk3-icon-browser.vcprojin | 8 +-
.../vs9/gtk3-ignore-broadway.vsprops | 0
{build/win32 => win32}/vs9/gtk3-install.vcproj | 2 +-
{build/win32 => win32}/vs9/gtk3-install.vspropsin | 26 +--
{build/win32 => win32}/vs9/gtk3-introspect.vcproj | 0
{build/win32 => win32}/vs9/gtk3-prebuild.vcproj | 0
.../vs9/gtk3-version-paths.vsprops.in | 4 +-
101 files changed, 698 insertions(+), 702 deletions(-)
---
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/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/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs10/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/<VSVer>10<\/VSVer>/<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 = ... # <list of headers to exclude from installation, separated by '|',
wildcards allowed; use random unsed value if none>
#
# 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 ' <File RelativePath="..\..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles
&& \
- echo ' <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'" />'
$(1).vs10.sourcefiles && \
- echo ' <ClCompile Include="..\..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
+ echo ' <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(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 ^<?xml version='1.0' encoding='UTF-8'?^> >$@
+ @echo ^<gresources^> >> $@
+ @echo ^<gresource prefix='/org/gtk/libgdk'^> >> $@
+ @for %%f in (..\gdk\resources\glsl\*.glsl) do @echo ^<file
alias='glsl/%%~nxf'^>resources/glsl/%%~nxf^</file^> >> $@
+ @echo ^</gresource^> >> $@
+ @echo ^</gresources^> >> $@
+
+..\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 ^<?xml version='1.0' encoding='UTF-8'?^>> $@
+ @echo ^<gresources^>>> $@
+ @echo ^<gresource prefix='/org/gtk/libgtk'^>>> $@
+ @echo ^<file^>theme/Adwaita/gtk.css^</file^>>> $@
+ @echo ^<file^>theme/Adwaita/gtk-dark.css^</file^>>> $@
+ @echo ^<file^>theme/Adwaita/gtk-contained.css^</file^>>> $@
+ @echo ^<file^>theme/Adwaita/gtk-contained-dark.css^</file^>>> $@
+ @for %%f in (..\gtk\theme\Adwaita\assets\*.png) do @echo ^<file
preprocess='to-pixdata'^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
+ @for %%f in (..\gtk\theme\Adwaita\assets\*.svg) do @echo
^<file^>theme/Adwaita/assets/%%~nxf^</file^>>> $@
+ @echo ^<file^>theme/HighContrast/gtk.css^</file^>>> $@
+ @echo ^<file
alias='theme/HighContrastInverse/gtk.css'^>theme/HighContrast/gtk-inverse.css^</file^>>> $@
+ @echo ^<file^>theme/HighContrast/gtk-contained.css^</file^>>> $@
+ @echo ^<file^>theme/HighContrast/gtk-contained-inverse.css^</file^>>> $@
+ @for %%f in (..\gtk\theme\HighContrast\assets\*.png) do @echo ^<file
preprocess='to-pixdata'^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
+ @for %%f in (..\gtk\theme\HighContrast\assets\*.svg) do @echo
^<file^>theme/HighContrast/assets/%%~nxf^</file^>>> $@
+ @echo ^<file^>theme/win32/gtk-win32-base.css^</file^>>> $@
+ @echo ^<file^>theme/win32/gtk.css^</file^>>> $@
+ @for %%f in (..\gtk\cursor\*.png) do @echo ^<file^>cursor/%%~nxf^</file^>>> $@
+ @for %%f in (..\gtk\gesture\*.symbolic.png) do @echo ^<file
alias='icons/64x64/actions/%%~nxf'^>gesture/%%~nxf^</file^>>> $@
+ @for %%f in (..\gtk\ui\*.ui) do @echo ^<file preprocess='xml-stripblanks'^>ui/%%~nxf^</file^>>> $@
+ @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 ^<file^>icons/%%sx%%s/%%c/%%~nxf^</file^>>> $@))
+ @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\gtk\icons\%%s\%%c\*.svg) do @echo
^<file^>icons/%%s/%%c/%%~nxf^</file^>>> $@))
+ @for %%f in (..\gtk\inspector\*.ui) do @echo ^<file compressed='true'
preprocess='xml-stripblanks'^>inspector/%%~nxf^</file^>>> $@
+ @echo ^<file^>inspector/logo.png^</file^>>> $@
+ @echo ^<file^>emoji/emoji.data^</file^>>> $@
+ @echo ^</gresource^>>> $@
+ @echo ^</gresources^>>> $@
+
+..\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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,7 +88,7 @@
<Link>
<AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -100,7 +100,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -112,7 +112,7 @@
<Link>
<AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -125,7 +125,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -138,7 +138,7 @@
<Link>
<AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
@@ -148,7 +148,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -159,7 +159,7 @@
<Link>
<AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
+ <ResourceCompile Include="..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
</ItemGroup>
<ItemGroup>
#include "gdk-3.vs10.sourcefiles.filters"
- <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -156,7 +156,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -178,7 +178,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -200,7 +200,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -223,7 +223,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -246,7 +246,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -268,7 +268,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -290,7 +290,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -311,11 +311,11 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
+ <ResourceCompile Include="..\..\gdk\win32\rc\gdk.rc" />
</ItemGroup>
<ItemGroup>
#include "gdk-3.vs10.sourcefiles"
- <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
+ <ClCompile Include="..\..\gdk\gdkkeynames.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gdk3-broadway.vcxproj">
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -82,7 +82,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,7 +107,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -82,7 +82,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,7 +107,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+#include "gtk-3.vs10.sourcefiles.filters"
+ <ClCompile Include="..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source
Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
+ </ItemGroup>
+</Project>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -163,28 +163,28 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
+ <ResourceCompile Include="..\..\gtk\gtk-win32.rc" />
</ItemGroup>
<ItemGroup>
#include "gtk-3.vs10.sourcefiles"
- <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
- <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
- <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
- <ClCompile Include="..\..\..\modules\input\imam-et.c" />
- <ClCompile Include="..\..\..\modules\input\imcedilla.c" />
- <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c" />
- <ClCompile Include="..\..\..\modules\input\imime.c" />
- <ClCompile Include="..\..\..\modules\input\iminuktitut.c" />
- <ClCompile Include="..\..\..\modules\input\imipa.c" />
- <ClCompile Include="..\..\..\modules\input\immultipress.c" />
- <ClCompile Include="..\..\..\modules\input\imthai.c" />
- <ClCompile Include="..\..\..\modules\input\imti-er.c" />
- <ClCompile Include="..\..\..\modules\input\imti-et.c" />
- <ClCompile Include="..\..\..\modules\input\imviqr.c" />
- <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
+ <ClCompile Include="..\..\modules\input\gtkimcontextime.c" />
+ <ClCompile Include="..\..\modules\input\gtkimcontextmultipress.c" />
+ <ClCompile Include="..\..\modules\input\gtkimcontextthai.c" />
+ <ClCompile Include="..\..\modules\input\imam-et.c" />
+ <ClCompile Include="..\..\modules\input\imcedilla.c" />
+ <ClCompile Include="..\..\modules\input\imcyrillic-translit.c" />
+ <ClCompile Include="..\..\modules\input\imime.c" />
+ <ClCompile Include="..\..\modules\input\iminuktitut.c" />
+ <ClCompile Include="..\..\modules\input\imipa.c" />
+ <ClCompile Include="..\..\modules\input\immultipress.c" />
+ <ClCompile Include="..\..\modules\input\imthai.c" />
+ <ClCompile Include="..\..\modules\input\imti-er.c" />
+ <ClCompile Include="..\..\modules\input\imti-et.c" />
+ <ClCompile Include="..\..\modules\input\imviqr.c" />
+ <ClCompile Include="..\..\modules\input\thai-charprop.c" />
</ItemGroup>
<ItemGroup>
- <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
+ <Manifest Include="..\..\gtk\libgtk3.manifest" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gdk-3.vcxproj">
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 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gtk\gtk-builder-tool.c" />
+ <ClCompile Include="..\..\gtk\gtk-builder-tool.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gdk-3.vcxproj">
diff --git a/win32/vs10/gtk-builder-tool.vcxproj.filters b/win32/vs10/gtk-builder-tool.vcxproj.filters
new file mode 100644
index 0000000000..e88646b264
--- /dev/null
+++ b/win32/vs10/gtk-builder-tool.vcxproj.filters
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Sources">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Headers">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\gtk\gtk-builder-tool.c"><Filter>Sources</Filter></ClCompile>
+ </ItemGroup>
+</Project>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -163,7 +163,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
+ <ClCompile Include="..\..\gtk\encodesymbolic.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gdk-3.vcxproj">
diff --git a/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters
b/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters
new file mode 100644
index 0000000000..3377263529
--- /dev/null
+++ b/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Sources">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Headers">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
+ </ItemGroup>
+</Project>
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 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gtk\gtk-query-settings.c" />
+ <ClCompile Include="..\..\gtk\gtk-query-settings.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gdk-3.vcxproj">
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters
b/win32/vs10/gtk-query-settings.vcxproj.filters
similarity index 93%
rename from build/win32/vs10/gtk-update-icon-cache.vcxproj.filters
rename to win32/vs10/gtk-query-settings.vcxproj.filters
index 24d654bd72..6e14aacf20 100644
--- a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters
+++ b/win32/vs10/gtk-query-settings.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
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 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\gtk\updateiconcache.c" />
+ <ClCompile Include="..\..\gtk\updateiconcache.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gtk3-prebuild.vcxproj">
diff --git a/win32/vs10/gtk-update-icon-cache.vcxproj.filters
b/win32/vs10/gtk-update-icon-cache.vcxproj.filters
new file mode 100644
index 0000000000..f62b142f16
--- /dev/null
+++ b/win32/vs10/gtk-update-icon-cache.vcxproj.filters
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Sources">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Headers">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
+ </ItemGroup>
+</Project>
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
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<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)</AdditionalIncludeDirectories>
+
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -121,7 +121,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,7 +143,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
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 @@
<GenerateRequiredSourcesBase>cd ..
set VCInstallDir=$(VCInstallDir)
nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
-
<GeneratedGdkSources>..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c</GeneratedGdkSources>
-
<GeneratedGtkSources>..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
- <GeneratedDemoSources>..\..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
+
<GeneratedGdkSources>..\..\config.h;..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\gdk\gdkmarshalers.h;..\..\gdk\gdkmarshalers.c;..\..\gdk\gdkresources.h;..\..\gdk\gdkresources.c</GeneratedGdkSources>
+
<GeneratedGtkSources>..\..\gtk\gtk-win32.rc;..\..\gtk\libgtk3.manifest;..\..\gtk\gtkdbusgenerated.h;..\..\gtk\gtkdbusgenerated.c</GeneratedGtkSources>
+ <GeneratedDemoSources>..\..\demos\gtk-demo\demos.h</GeneratedDemoSources>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +140,7 @@
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
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
</GtkDoInstall>
<GtkDoInstallBroadwayHeaders>
-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"
</GtkDoInstallBroadwayHeaders>
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 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
+ <CustomBuild Include="..\..\config.h.win32">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
<AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles)</AdditionalInputs>
<Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
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 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\gtkpc.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
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 @@
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
- <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <CopyDir>..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
<ApiVersion>3.0</ApiVersion>
<GtkVersion>@GTK_VERSION@</GtkVersion>
<GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
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 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
@@ -95,7 +95,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
diff --git a/build/win32/vs9/gailutil-3.vcprojin b/win32/vs9/gailutil-3.vcprojin
similarity index 88%
rename from build/win32/vs9/gailutil-3.vcprojin
rename to win32/vs9/gailutil-3.vcprojin
index f5ea4bb734..e4b2214016 100644
--- a/build/win32/vs9/gailutil-3.vcprojin
+++ b/win32/vs9/gailutil-3.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -46,7 +46,7 @@
AdditionalDependencies="atk-1.0.lib"
OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
GenerateDebugInformation="true"
- ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+ ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
SubSystem="2"
TargetMachine="1"
@@ -64,7 +64,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
AdditionalDependencies="atk-1.0.lib"
OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+ ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
@@ -99,7 +99,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -113,7 +113,7 @@
AdditionalDependencies="atk-1.0.lib"
OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
GenerateDebugInformation="true"
- ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+ ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
SubSystem="2"
OptimizeReferences="2"
@@ -133,7 +133,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -145,7 +145,7 @@
AdditionalDependencies="atk-1.0.lib"
OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
LinkIncremental="1"
- ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+ ModuleDefinitionFile="..\..\libgail-util\gailutil.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
diff --git a/build/win32/vs9/gdk-3.vcprojin b/win32/vs9/gdk-3.vcprojin
similarity index 91%
rename from build/win32/vs9/gdk-3.vcprojin
rename to win32/vs9/gdk-3.vcprojin
index 5f228db34e..1c5df88a78 100644
--- a/build/win32/vs9/gdk-3.vcprojin
+++ b/win32/vs9/gdk-3.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -127,7 +127,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -159,7 +159,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -191,7 +191,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -223,7 +223,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32;..\..\gdk\broadway"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -290,7 +290,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
+ <File RelativePath="..\..\gdk\win32\rc\gdk.rc" />
</Filter>
<Filter
Name="Source Files"
@@ -298,7 +298,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
#include "gdk-3.sourcefiles"
- <File RelativePath="..\..\..\gdk\gdkkeynames.c" />
+ <File RelativePath="..\..\gdk\gdkkeynames.c" />
</Filter>
</Files>
</VisualStudioProject>
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 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -53,7 +53,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\broadway"
PreprocessorDefinitions="$(GdkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/gdk3-win32.vcprojin b/win32/vs9/gdk3-win32.vcprojin
similarity index 91%
rename from build/win32/vs9/gdk3-win32.vcprojin
rename to win32/vs9/gdk3-win32.vcprojin
index fe26bd9117..8a618aa510 100644
--- a/build/win32/vs9/gdk3-win32.vcprojin
+++ b/win32/vs9/gdk3-win32.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -53,7 +53,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -73,7 +73,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/gtk+.sln b/win32/vs9/gtk+.sln
similarity index 100%
rename from build/win32/vs9/gtk+.sln
rename to win32/vs9/gtk+.sln
diff --git a/build/win32/vs9/gtk-3.vcprojin b/win32/vs9/gtk-3.vcprojin
similarity index 75%
rename from build/win32/vs9/gtk-3.vcprojin
rename to win32/vs9/gtk-3.vcprojin
index 112ab5aff1..c17fd45051 100644
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/win32/vs9/gtk-3.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GtkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -95,7 +95,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+ AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
PreprocessorDefinitions="$(GtkDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -162,8 +162,8 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\gtk\gtk-win32.rc" />
- <File RelativePath="..\..\..\gtk\libgtk3.manifest" />
+ <File RelativePath="..\..\gtk\gtk-win32.rc" />
+ <File RelativePath="..\..\gtk\libgtk3.manifest" />
</Filter>
<Filter
Name="Source Files"
@@ -171,21 +171,21 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
#include "gtk-3.sourcefiles"
- <File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
- <File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
- <File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
- <File RelativePath="..\..\..\modules\input\imam-et.c" />
- <File RelativePath="..\..\..\modules\input\imcedilla.c" />
- <File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
- <File RelativePath="..\..\..\modules\input\imime.c" />
- <File RelativePath="..\..\..\modules\input\iminuktitut.c" />
- <File RelativePath="..\..\..\modules\input\imipa.c" />
- <File RelativePath="..\..\..\modules\input\immultipress.c" />
- <File RelativePath="..\..\..\modules\input\imthai.c" />
- <File RelativePath="..\..\..\modules\input\imti-er.c" />
- <File RelativePath="..\..\..\modules\input\imti-et.c" />
- <File RelativePath="..\..\..\modules\input\imviqr.c" />
- <File RelativePath="..\..\..\modules\input\thai-charprop.c" />
+ <File RelativePath="..\..\modules\input\gtkimcontextime.c" />
+ <File RelativePath="..\..\modules\input\gtkimcontextmultipress.c" />
+ <File RelativePath="..\..\modules\input\gtkimcontextthai.c" />
+ <File RelativePath="..\..\modules\input\imam-et.c" />
+ <File RelativePath="..\..\modules\input\imcedilla.c" />
+ <File RelativePath="..\..\modules\input\imcyrillic-translit.c" />
+ <File RelativePath="..\..\modules\input\imime.c" />
+ <File RelativePath="..\..\modules\input\iminuktitut.c" />
+ <File RelativePath="..\..\modules\input\imipa.c" />
+ <File RelativePath="..\..\modules\input\immultipress.c" />
+ <File RelativePath="..\..\modules\input\imthai.c" />
+ <File RelativePath="..\..\modules\input\imti-er.c" />
+ <File RelativePath="..\..\modules\input\imti-et.c" />
+ <File RelativePath="..\..\modules\input\imviqr.c" />
+ <File RelativePath="..\..\modules\input\thai-charprop.c" />
</Filter>
</Files>
</VisualStudioProject>
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}"
>
- <File RelativePath="..\..\..\gtk\gtk-builder-tool.c" />
+ <File RelativePath="..\..\gtk\gtk-builder-tool.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj b/win32/vs9/gtk-encode-symbolic-svg.vcproj
similarity index 93%
rename from build/win32/vs9/gtk-encode-symbolic-svg.vcproj
rename to win32/vs9/gtk-encode-symbolic-svg.vcproj
index 52b68b20d6..5e62ae3b75 100644
--- a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
+++ b/win32/vs9/gtk-encode-symbolic-svg.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk"
+ AdditionalIncludeDirectories="..\..\gdk"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk"
+ AdditionalIncludeDirectories="..\..\gdk"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions=""
RuntimeLibrary="2"
@@ -95,7 +95,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk"
+ AdditionalIncludeDirectories="..\..\gdk"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk"
+ AdditionalIncludeDirectories="..\..\gdk"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions=""
RuntimeLibrary="2"
@@ -156,7 +156,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gtk\encodesymbolic.c" />
+ <File RelativePath="..\..\gtk\encodesymbolic.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk-query-settings.vcproj b/win32/vs9/gtk-query-settings.vcproj
similarity index 98%
rename from build/win32/vs9/gtk-query-settings.vcproj
rename to win32/vs9/gtk-query-settings.vcproj
index a893c958dd..a3a05dfa5e 100644
--- a/build/win32/vs9/gtk-query-settings.vcproj
+++ b/win32/vs9/gtk-query-settings.vcproj
@@ -152,7 +152,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gtk\gtk-query-settings.c" />
+ <File RelativePath="..\..\gtk\gtk-query-settings.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk-update-icon-cache.vcproj b/win32/vs9/gtk-update-icon-cache.vcproj
similarity index 98%
rename from build/win32/vs9/gtk-update-icon-cache.vcproj
rename to win32/vs9/gtk-update-icon-cache.vcproj
index 0b15f3a038..8964c062d3 100644
--- a/build/win32/vs9/gtk-update-icon-cache.vcproj
+++ b/win32/vs9/gtk-update-icon-cache.vcproj
@@ -152,7 +152,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\gtk\updateiconcache.c" />
+ <File RelativePath="..\..\gtk\updateiconcache.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtk3-build-defines.vsprops b/win32/vs9/gtk3-build-defines.vsprops
similarity index 89%
rename from build/win32/vs9/gtk3-build-defines.vsprops
rename to win32/vs9/gtk3-build-defines.vsprops
index 1f2b416a4c..c1c3cad31c 100644
--- a/build/win32/vs9/gtk3-build-defines.vsprops
+++ b/win32/vs9/gtk3-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
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="..\..;$(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"
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops b/win32/vs9/gtk3-copy-gdk-broadway.vsprops
similarity index 100%
rename from build/win32/vs9/gtk3-copy-gdk-broadway.vsprops
rename to win32/vs9/gtk3-copy-gdk-broadway.vsprops
diff --git a/build/win32/vs9/gtk3-demo-application.vcprojin b/win32/vs9/gtk3-demo-application.vcprojin
similarity index 100%
rename from build/win32/vs9/gtk3-demo-application.vcprojin
rename to win32/vs9/gtk3-demo-application.vcprojin
diff --git a/build/win32/vs9/gtk3-demo.vcprojin b/win32/vs9/gtk3-demo.vcprojin
similarity index 93%
rename from build/win32/vs9/gtk3-demo.vcprojin
rename to win32/vs9/gtk3-demo.vcprojin
index e7e55076bd..0c4795b3e6 100644
--- a/build/win32/vs9/gtk3-demo.vcprojin
+++ b/win32/vs9/gtk3-demo.vcprojin
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -95,7 +95,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
PreprocessorDefinitions="$(GtkPrefixDefine)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -127,7 +127,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\gtk"
PreprocessorDefinitions="$(GtkPrefixDefine)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/win32/vs9/gtk3-gen-srcs.vsprops
similarity index 59%
rename from build/win32/vs9/gtk3-gen-srcs.vsprops
rename to win32/vs9/gtk3-gen-srcs.vsprops
index 8e8f184750..6b7264b850 100644
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/win32/vs9/gtk3-gen-srcs.vsprops
@@ -11,14 +11,14 @@
/>
<UserMacro
Name="GeneratedGdkSources"
-
Value="..\..\..\config.h;..\..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\..\gdk\gdkmarshalers.h;..\..\..\gdk\gdkmarshalers.c;..\..\..\gdk\gdkresources.h;..\..\..\gdk\gdkresources.c"
+
Value="..\..\config.h;..\..\gdk\gdkconfig.h;..\..\gdk\gdkversionmacros.h;..\..\gdk\gdkmarshalers.h;..\..\gdk\gdkmarshalers.c;..\..\gdk\gdkresources.h;..\..\gdk\gdkresources.c"
/>
<UserMacro
Name="GeneratedGtkSources"
-
Value="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;..\..\..\gtk\gtkdbusgenerated.h;..\..\..\gtk\gtkdbusgenerated.c"
+
Value="..\..\gtk\gtk-win32.rc;..\..\gtk\libgtk3.manifest;..\..\gtk\gtkdbusgenerated.h;..\..\gtk\gtkdbusgenerated.c"
/>
<UserMacro
Name="GeneratedDemoSources"
- Value="..\..\..\demos\gtk-demo\demos.h"
+ Value="..\..\demos\gtk-demo\demos.h"
/>
</VisualStudioPropertySheet>
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 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -62,7 +62,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions=""
RuntimeLibrary="2"
@@ -95,7 +95,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
+ AdditionalIncludeDirectories="..\..\gdk;..\..\demos\icon-browser"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions=""
RuntimeLibrary="2"
diff --git a/build/win32/vs9/gtk3-ignore-broadway.vsprops b/win32/vs9/gtk3-ignore-broadway.vsprops
similarity index 100%
rename from build/win32/vs9/gtk3-ignore-broadway.vsprops
rename to win32/vs9/gtk3-ignore-broadway.vsprops
diff --git a/build/win32/vs9/gtk3-install.vcproj b/win32/vs9/gtk3-install.vcproj
similarity index 99%
rename from build/win32/vs9/gtk3-install.vcproj
rename to win32/vs9/gtk3-install.vcproj
index be1e9c125b..01f7bbc83d 100644
--- a/build/win32/vs9/gtk3-install.vcproj
+++ b/win32/vs9/gtk3-install.vcproj
@@ -139,7 +139,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\gtkpc.py">
+ <File RelativePath="..\gtkpc.py">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VCCustomBuildTool"
Description="Generating .pc files..."
diff --git a/build/win32/vs9/gtk3-install.vspropsin b/win32/vs9/gtk3-install.vspropsin
similarity index 89%
rename from build/win32/vs9/gtk3-install.vspropsin
rename to win32/vs9/gtk3-install.vspropsin
index beaf89b353..387a2a014d 100644
--- a/build/win32/vs9/gtk3-install.vspropsin
+++ b/win32/vs9/gtk3-install.vspropsin
@@ -125,7 +125,7 @@ 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.headers"
#include "gdk3-win32.headers"
@@ -137,24 +137,24 @@ mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

#include "gailutil-3.headers"
mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

-copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

+copy ..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

-copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

+copy ..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

-copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

+copy ..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

-copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

+copy ..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

-copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

+copy ..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

-copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png
$(CopyDir)\share\icons\hicolor\256x256\apps\

+copy ..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\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

"
/>
<UserMacro
@@ -170,7 +170,7 @@ $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(Co
<UserMacro
Name="GtkDoInstallBroadwayHeaders"
Value="
-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.headers"
"
diff --git a/build/win32/vs9/gtk3-introspect.vcproj b/win32/vs9/gtk3-introspect.vcproj
similarity index 100%
rename from build/win32/vs9/gtk3-introspect.vcproj
rename to win32/vs9/gtk3-introspect.vcproj
diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/win32/vs9/gtk3-prebuild.vcproj
similarity index 100%
rename from build/win32/vs9/gtk3-prebuild.vcproj
rename to win32/vs9/gtk3-prebuild.vcproj
diff --git a/build/win32/vs9/gtk3-version-paths.vsprops.in b/win32/vs9/gtk3-version-paths.vsprops.in
similarity index 91%
rename from build/win32/vs9/gtk3-version-paths.vsprops.in
rename to win32/vs9/gtk3-version-paths.vsprops.in
index 3024bb2cfd..d6ac03f262 100644
--- a/build/win32/vs9/gtk3-version-paths.vsprops.in
+++ b/win32/vs9/gtk3-version-paths.vsprops.in
@@ -10,11 +10,11 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="ApiVersion"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
