summaryrefslogtreecommitdiff
path: root/build/introspection-msvc.mak
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2015-08-17 19:11:53 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2015-08-17 19:11:53 +0800
commitaea7809f55ac520b9d2d5d9c1eea1345fabbd7a7 (patch)
treeda16542e210b83fcc2d5e0e11d08cdf539084de3 /build/introspection-msvc.mak
parentab09ffaa8cd38380f455ea51acf2474d0d31aad5 (diff)
downloadgtk+-aea7809f55ac520b9d2d5d9c1eea1345fabbd7a7.tar.gz
MSVC Introspection Builds: Remove GCC Requirement
G-I has been updated to not require a Windows GCC installation anymore to generate the .gir files, so update the NMake Makefiles that are used for this purpose. As a result, it is no longer necessary to define time_t for the .gir generation as we are on the same compiler throughout the process.
Diffstat (limited to 'build/introspection-msvc.mak')
-rw-r--r--build/introspection-msvc.mak16
1 files changed, 1 insertions, 15 deletions
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
index beff817d00..55eec4574d 100644
--- a/build/introspection-msvc.mak
+++ b/build/introspection-msvc.mak
@@ -26,7 +26,6 @@ VALID_PKG_CONFIG_PATH = FALSE
VALID_GCC_INSTPATH = FALSE
MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in %MINGWDIR%\bin
MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
ERROR_MSG =
@@ -47,15 +46,7 @@ VALID_PKG_CONFIG_PATH = TRUE
VALID_PKG_CONFIG_PATH = FALSE
!endif
-!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
-!endif
-
-!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
-!endif
-
-!include gcccheck.x
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
!endif
VALID_CFGSET = FALSE
@@ -63,11 +54,6 @@ VALID_CFGSET = FALSE
VALID_CFGSET = TRUE
!endif
-!if "$(VALID_GCC_INSTPATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_MINGWDIR)
-!endif
-
!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
BUILD_INTROSPECTION = FALSE
ERROR_MSG = $(MSG_INVALID_PKGCONFIG)