summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2017-01-09 15:33:25 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2017-01-09 15:38:48 +0800
commitea58ebe76d1854b0b42ad960a3d3e61203e7a3c5 (patch)
tree4eacffaa32abdb86a54feb44c15aa3ce3d62d852 /gdk
parente382d9d9b57fcbef518385a73cda29d3a8743d77 (diff)
downloadgtk+-ea58ebe76d1854b0b42ad960a3d3e61203e7a3c5.tar.gz
Visual Studio builds: Move project files to win32/
It was suggested that the project files to be moved to win32/, so that we can have one less layer of directories we need to go down into to reach the project files.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/Makefile.am16
-rw-r--r--gdk/win32/Makefile.am6
2 files changed, 11 insertions, 11 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 064fe39fb2..162016a114 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -476,7 +476,7 @@ gdk_4_HEADERS_INST = \
gdk_4_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
if HAVE_INTROSPECTION
# Introspection Items for MSVC
@@ -487,10 +487,10 @@ BASE_MSVC_GIR_CFLAGS = \
-I../.. -I../../gdk -I.../../gdk/win32
INTROSPECTION_INTERMEDIATE_ITEMS = \
- $(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/Gdk_4_0_gir_list \
- $(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect \
- $(top_builddir)/build/win32/GdkWin32_4_0_gir_list
+ $(top_builddir)/win32/Gdk-4.0.gir.msvc.introspect \
+ $(top_builddir)/win32/Gdk_4_0_gir_list \
+ $(top_builddir)/win32/GdkWin32-4.0.gir.msvc.introspect \
+ $(top_builddir)/win32/GdkWin32_4_0_gir_list
Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_noinst_4_0_gir_EXPORT_PACKAGES)
@@ -508,15 +508,15 @@ GdkWin32_4_0_gir_MSVC_SCANNERFLAGS = \
--c-include="gdk/gdkwin32.h" \
--include-uninstalled=./Gdk-4.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/vs12/gdk-4.vcxproj \
- $(top_builddir)/build/win32/vs12/gdk-4.vs12.headers \
+ $(top_builddir)/win32/vs12/gdk-4.vcxproj \
+ $(top_builddir)/win32/vs12/gdk-4.vs12.headers \
$(INTROSPECTION_INTERMEDIATE_ITEMS)
DISTCLEANFILES = gdkconfig.h stamp-gc-h
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 991dc9e3bc..596f183892 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -99,10 +99,10 @@ gdk4_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
gdk4_win32_HEADERS_EXCLUDES = dummy
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
dist-hook: \
- $(top_builddir)/build/win32/vs12/gdk4-win32.vcxproj \
- $(top_builddir)/build/win32/vs12/gdk4-win32.vs12.headers
+ $(top_builddir)/win32/vs12/gdk4-win32.vcxproj \
+ $(top_builddir)/win32/vs12/gdk4-win32.vs12.headers
-include $(top_srcdir)/git.mk