[gtk/gtk-3-24] build/win32/config-msvc.mak.in: Add more configurations
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] build/win32/config-msvc.mak.in: Add more configurations
- Date: Wed, 31 Jul 2019 10:57:17 +0000 (UTC)
commit 6775e63d99dfe1386e6ac9f64245c951760d6ac8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jul 31 16:56:29 2019 +0800
build/win32/config-msvc.mak.in: Add more configurations
This adds a configurable path for pkg-config, in case it is not in the
PATH, which will replace the entry in introspection-msvc.mak eventually.
Also add a set of preprocessor flags for GDK that we can use later for
introspection.
Fix the previous commit as the default PREFIX is missing a layer of
parentdir.
build/win32/config-msvc.mak.in | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/build/win32/config-msvc.mak.in b/build/win32/config-msvc.mak.in
index 69cf931b60..49c077deef 100644
--- a/build/win32/config-msvc.mak.in
+++ b/build/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
@@ -16,6 +16,11 @@ PERL = perl
PYTHON=python
!endif
+# Path to the pkg-config tool, if not already in the PATH
+!if "$(PKG_CONFIG)" == ""
+PKG_CONFIG=pkg-config
+!endif
+
# Configurable paths to the various scripts and tools that we are using
!ifndef GLIB_MKENUMS
GLIB_MKENUMS = $(PREFIX)\bin\glib-mkenums
@@ -36,6 +41,13 @@ GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
# Please do not change anything beneath this line unless maintaining the NMake Makefiles
GTK_VERSION = @GTK_VERSION@
+GDK_PREPROCESSOR_FLAGS = \
+ /DG_LOG_USE_STRUCTURED=1 \
+ /DGDK_COMPILATION \
+ /I..\.. \
+ /I..\..\gdk \
+ /I..\..\gdk\win32
+
GTK_PREPROCESSOR_FLAGS = \
/I..\..\gtk \
/I..\..\gdk \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]