diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:08:33 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:08:33 +0800 |
| commit | b852c1a0b9a43081733a931bbb7d1a56c6c03328 (patch) | |
| tree | f42077aa125bf1b3505f330da592ef1ed54d5d7b | |
| parent | a3fa50fc545c51526cb959448f3eb06994eef470 (diff) | |
| download | atk-b852c1a0b9a43081733a931bbb7d1a56c6c03328.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.
| -rw-r--r-- | build/atk-introspection-msvc.mak | 2 | ||||
| -rw-r--r-- | build/introspection-msvc.mak | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/build/atk-introspection-msvc.mak b/build/atk-introspection-msvc.mak index 8b4c38c..05caaa5 100644 --- a/build/atk-introspection-msvc.mak +++ b/build/atk-introspection-msvc.mak @@ -19,7 +19,7 @@ Atk-$(APIVERSION).gir: atk_list @-echo Generating Atk-$(APIVERSION).gir... @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;$(BASEDIR)\lib;$(LIB) $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. --add-include-path=.. \ 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) |