[gobject-introspection] MSVC Builds: Drop GCC Requirement



commit 8aabc213f26f1de693f58619035d71703d23bc91
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sat Aug 2 11:55:38 2014 +0800

    MSVC Builds: Drop GCC Requirement
    
    As we are running the preprocessor without using stdin as its input, we can
    now drop the MSVC build-time dependency on a MinGW/GCC installation for
    introspection files, which means we also don't need to supply definitions
    for time_t anymore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728313

 build/gi-build-common-msvc.mak |    8 --------
 build/gi-setenv-msvc.mak       |    2 +-
 build/introspection-msvc.mak   |   17 +----------------
 3 files changed, 2 insertions(+), 25 deletions(-)
---
diff --git a/build/gi-build-common-msvc.mak b/build/gi-build-common-msvc.mak
index d2ab08e..c7db78a 100644
--- a/build/gi-build-common-msvc.mak
+++ b/build/gi-build-common-msvc.mak
@@ -15,11 +15,3 @@ BINDIR = ..\build\win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin
 G_IR_SCANNER_CURRENT = ..\tools\g-ir-scanner
 G_IR_DOC_TOOL_CURRENT = ..\tools\g-ir-doc-tool
 G_IR_COMPILER_CURRENT = $(BINDIR)\g-ir-compiler.exe
-
-!if "$(VALID_GCC_INSTPATH)" == "TRUE"
-!if "$(PLAT)" == "x64"
-TIME_T_DEFINE = -Dtime_t=long long
-!else
-TIME_T_DEFINE = -Dtime_t=long
-!endif
-!endif
diff --git a/build/gi-setenv-msvc.mak b/build/gi-setenv-msvc.mak
index 74730ee..6ebd966 100644
--- a/build/gi-setenv-msvc.mak
+++ b/build/gi-setenv-msvc.mak
@@ -8,6 +8,6 @@ setgirbuildnev:
        @set UNINSTALLED_INTROSPECTION_SRCDIR=..
        @set UNINSTALLED_INTROSPECTION_BUILDDIR=..
        @set PYTHONPATH=..;$(BINDIR)
-       @set PATH=$(BINDIR);$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
+       @set PATH=$(BINDIR);$(BASEDIR)\bin;$(PATH)
        @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
        @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\lib;$(LIB)
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
index beff817..8e363a4 100644
--- a/build/introspection-msvc.mak
+++ b/build/introspection-msvc.mak
@@ -23,10 +23,8 @@ PYTHON2=python
 
 # Don't change anything following this line!
 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 +45,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 +53,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]