diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2021-12-21 18:40:26 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2022-01-04 11:07:28 +0800 |
| commit | 334333f77913f5c186f2d2482aa7ddfcdc0ac828 (patch) | |
| tree | 6faa3a66a88f63370bfff76250181df7d797eb99 /gdk | |
| parent | 74d43defc5d97eb13cddf95bdd22625cde20db37 (diff) | |
| download | gtk+-334333f77913f5c186f2d2482aa7ddfcdc0ac828.tar.gz | |
Visual Studio projects: Improve generating GDK sources
This makes the rest of the sources that are generated being put in GDK's build
directory for the Visual Studio projects, instead of being placed in GDK's
source subdir, so that:
* We can avoid polluting GDK's source tree.
* The Visual Studio builds won't interfere with the Meson builds.
Update the project files to look for the generated sources and headers in the
right places, as well as making the introspection builds look for the generated
sources as well.
Also remove the gtk3-gen-srcs property sheets and put the relevant parts in the
corresponding gtk3-build-defines property sheets, to clean things up a bit.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index c6639c1a28..f425e0803e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -457,14 +457,13 @@ gdkresources.c: gdk.gresource.xml $(resource_files) # ------------------- MSVC Build Items ---------------- MSVCPROJS = gdk-3 -gdk_3_FILES = $(libgdk_3_la_SOURCES) +gdk_3_FILES = $(gdk_c_sources) gdk_3_EXCLUDES = dummy gdk_3_HEADERS_DIR = $(gdkincludedir) gdk_3_HEADERS_INST = \ $(gdkinclude_HEADERS) \ - $(deprecatedinclude_HEADERS) \ - $(nodist_gdkinclude_HEADERS) + $(deprecatedinclude_HEADERS) gdk_3_HEADERS_EXCLUDES = dummy @@ -476,7 +475,9 @@ 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'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3' -I.. \ + -I'./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/obj/gdk-3/gdk' -I../gdk \ + -I../gdk/win32 INTROSPECTION_INTERMEDIATE_ITEMS = \ $(top_builddir)/win32/Gdk-3.0.gir.msvc.introspect \ @@ -484,7 +485,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \ $(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_FILES = $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ + $(gdk_c_sources) \ Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES) Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES) Gdk_3_0_gir_MSVC_LIBS = gdk-3.0 |