diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:10:11 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:10:11 +0800 |
commit | 0ed6637e82f13ddeb3d33a44f2a91a6c1034f64c (patch) | |
tree | 4f5c129a89b4e59f2dd06eb0bd80629bc2514fef /build | |
parent | 3b4c40c9387d8fca7bc1f2c7d1f98bcfd863f8b0 (diff) | |
download | gdk-pixbuf-0ed6637e82f13ddeb3d33a44f2a91a6c1034f64c.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.
Diffstat (limited to 'build')
-rw-r--r-- | build/gdk-pixbuf-introspection-msvc.mak | 2 | ||||
-rw-r--r-- | 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 e4c4a9fe4..df6b2d02c 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 beff817d0..55eec4574 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) |