callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/win32/config-msvc.mak.in: Add more configurations

Browse Source 
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.
This commit is contained in:
Chun-wei Fan
2019-07-31 16:56:29 +08:00
parent 80c14d7cf9
commit 6775e63d99
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/win32/config-msvc.mak.in
View File

@ -4,7 +4,7 @@
# Default prefix if not defined # Default prefix if not defined
!ifndef PREFIX !ifndef PREFIX
PREFIX=..\..\vs$(VSVER)\$(PLAT) PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
!endif !endif
# Configurable paths to the various interpreters we need # Configurable paths to the various interpreters we need
@ -16,6 +16,11 @@ PERL = perl
PYTHON=python PYTHON=python
!endif !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 # Configurable paths to the various scripts and tools that we are using
!ifndef GLIB_MKENUMS !ifndef GLIB_MKENUMS
GLIB_MKENUMS = $(PREFIX)\bin\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 # Please do not change anything beneath this line unless maintaining the NMake Makefiles
GTK_VERSION = @GTK_VERSION@ GTK_VERSION = @GTK_VERSION@
GDK_PREPROCESSOR_FLAGS = \
/DG_LOG_USE_STRUCTURED=1 \
/DGDK_COMPILATION \
/I..\.. \
/I..\..\gdk \
/I..\..\gdk\win32
GTK_PREPROCESSOR_FLAGS = \ GTK_PREPROCESSOR_FLAGS = \
/I..\..\gtk \ /I..\..\gtk \
/I..\..\gdk \ /I..\..\gdk \