builds: Fix introspection with MSVC builds
For building the introspection dumper program on Visual Studio, leave out the G_LOG_DOMAIN as g-ir-scanner does not like it when it constructs the compiler command line for Visual Studio. Also ensure that we are looking for the freshly-built libraries by looking for the .lib's from the output directories of the Visual Studio project files.
This commit is contained in:
@ -109,6 +109,7 @@ $(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
|
||||
|
||||
|
||||
@ -34,12 +34,12 @@ EXTRA_DIST += \
|
||||
gdkversionmacros.h.in
|
||||
|
||||
GDK_CFLAGS_DEFINES = \
|
||||
-DG_LOG_DOMAIN=\"Gdk\" \
|
||||
-DG_LOG_USE_STRUCTURED=1 \
|
||||
-DGDK_COMPILATION
|
||||
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-DG_LOG_DOMAIN=\"Gdk\" \
|
||||
$(GDK_CFLAGS_DEFINES) \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_builddir)/gdk \
|
||||
|
||||
@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = subdir-objects
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
GTK_BASE_CFLAGS_DEFINES = \
|
||||
-DG_LOG_DOMAIN=\"Gtk\" \
|
||||
-DG_LOG_USE_STRUCTURED=1 \
|
||||
-DGTK_VERSION=\"$(GTK_VERSION)\" \
|
||||
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
|
||||
@ -20,6 +19,7 @@ GTK_PLAT_CFLAGS_DEFINES = \
|
||||
-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-DG_LOG_DOMAIN=\"Gtk\" \
|
||||
$(GTK_BASE_CFLAGS_DEFINES) \
|
||||
$(GTK_PLAT_CFLAGS_DEFINES) \
|
||||
-DX11_DATA_PREFIX=\"$(X11_PREFIX)\" \
|
||||
|
||||
Reference in New Issue
Block a user