[gdk-pixbuf] MSVC Introspection Builds: Remove GCC Requirement
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] MSVC Introspection Builds: Remove GCC Requirement
- Date: Mon, 17 Aug 2015 11:10:29 +0000 (UTC)
commit 0ed6637e82f13ddeb3d33a44f2a91a6c1034f64c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Aug 17 19:10:11 2015 +0800
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.
build/gdk-pixbuf-introspection-msvc.mak | 2 +-
build/introspection-msvc.mak | 16 +---------------
2 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/build/gdk-pixbuf-introspection-msvc.mak b/build/gdk-pixbuf-introspection-msvc.mak
index e4c4a9f..df6b2d0 100644
--- a/build/gdk-pixbuf-introspection-msvc.mak
+++ b/build/gdk-pixbuf-introspection-msvc.mak
@@ -18,7 +18,7 @@ gdkpixbuf_list:
setgirbuildnev:
@-set CC=$(CC)
@-set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
- @-set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
+ @-set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH)
@-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
@-set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
index beff817..55eec45 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]