From c0e56e5af9e00137de1eb603ac1625332176f407 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 4 Sep 2015 18:08:46 +0800 Subject: MSVC Builds: Rename testsrules_msvc.mak Rename this to detectenv-msvc.mak to be consistent with the other GNOME projects that support MSVC builds, and clean that file up a bit. --- build/Makefile.am | 2 +- build/detectenv-msvc.mak | 65 ++++++++++++++++++++++++++++++++++ build/pango-introspection-msvc.mak | 3 +- build/testsrules_msvc.mak | 72 -------------------------------------- 4 files changed, 67 insertions(+), 75 deletions(-) create mode 100644 build/detectenv-msvc.mak delete mode 100644 build/testsrules_msvc.mak diff --git a/build/Makefile.am b/build/Makefile.am index 0ca470ba..d562d7a3 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = win32 EXTRA_DIST = \ pango-introspection-msvc.mak \ introspection-msvc.mak \ - testsrules_msvc.mak \ + detectenv-msvc.mak \ gen-file-list-pango.py -include $(top_srcdir)/git.mk diff --git a/build/detectenv-msvc.mak b/build/detectenv-msvc.mak new file mode 100644 index 00000000..020548af --- /dev/null +++ b/build/detectenv-msvc.mak @@ -0,0 +1,65 @@ +# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or +# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) +!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) +MSG = ^ +This Makefile is only for Visual Studio 2008 and later.^ +You need to ensure that the Visual Studio Environment is properly set up^ +before running this Makefile. +!error $(MSG) +!endif + +ERRNUL = 2>NUL +_HASH=^# + +!if ![echo VCVERSION=_MSC_VER > vercl.x] \ + && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ + && ![echo PLAT=Win32 >> vercl.x] \ + && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ + && ![echo PLAT=x64 >> vercl.x] \ + && ![echo $(_HASH)endif >> vercl.x] \ + && ![cl -nologo -TC -P vercl.x $(ERRNUL)] +!include vercl.i +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] +!endif + +!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 +VSVER = 9 +!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 +VSVER = 10 +!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 +VSVER = 11 +!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 +VSVER = 12 +!else +VSVER = 0 +!endif + +!if "$(VSVER)" == "0" +MSG = ^ +This NMake Makefile set supports Visual Studio^ +9 (2008) through 12 (2013). Your Visual Studio^ +version is not supported. +!error $(MSG) +!endif + +VALID_CFGSET = FALSE +!if "$(CFG)" == "release" || "$(CFG)" == "debug" +VALID_CFGSET = TRUE +!endif + +!if "$(CFG)" == "release" +CFLAGS_ADD = /MD /O2 +!else +CFLAGS_ADD = /MDd /Od /Zi +!endif + +!if "$(PLAT)" == "x64" +LDFLAGS_ARCH = /machine:x64 +!else +LDFLAGS_ARCH = /machine:x86 +!endif diff --git a/build/pango-introspection-msvc.mak b/build/pango-introspection-msvc.mak index 0237626d..52ec8063 100644 --- a/build/pango-introspection-msvc.mak +++ b/build/pango-introspection-msvc.mak @@ -1,6 +1,6 @@ # NMake Makefile to build Introspection Files for Pango -!include testsrules_msvc.mak +!include detectenv-msvc.mak APIVERSION = 1.0 @@ -32,7 +32,6 @@ install-introspection: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).t !endif setbuildenv: - @set CC=$(CC) @set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH) @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) diff --git a/build/testsrules_msvc.mak b/build/testsrules_msvc.mak deleted file mode 100644 index 1f4669ee..00000000 --- a/build/testsrules_msvc.mak +++ /dev/null @@ -1,72 +0,0 @@ -# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or -# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) -!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) -MSG = ^ -This Makefile is only for Visual Studio 2008 and later.^ -You need to ensure that the Visual Studio Environment is properly set up^ -before running this Makefile. -!error $(MSG) -!endif - -ERRNUL = 2>NUL -_HASH=^# - -!if ![echo VCVERSION=_MSC_VER > vercl.x] \ - && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ - && ![echo PLAT=Win32 >> vercl.x] \ - && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ - && ![echo PLAT=x64 >> vercl.x] \ - && ![echo $(_HASH)endif >> vercl.x] \ - && ![cl -nologo -TC -P vercl.x $(ERRNUL)] -!include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ - && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] -!include vercl.vc -!endif -!endif -!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] -!endif - -!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 -VSVER = 9 -!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 -VSVER = 10 -!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 -VSVER = 11 -!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 -VSVER = 12 -!else -VSVER = 0 -!endif - -!if "$(VSVER)" == "0" -MSG = ^ -This NMake Makefile set supports Visual Studio^ -9 (2008) through 12 (2013). Your Visual Studio^ -version is not supported. -!error $(MSG) -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" -VALID_CFGSET = TRUE -!endif - -!if "$(CFG)" == "release" -CFLAGS_ADD = /MD /O2 -!else -CFLAGS_ADD = /MDd /Od /Zi -!endif - -!if "$(PLAT)" == "x64" -LDFLAGS_ARCH = /machine:x64 -!else -LDFLAGS_ARCH = /machine:x86 -!endif - -LD = link.exe -LD_CFLAGS = /link -EXEEXT = .exe -GLIB_LIBS = gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib - -PANGO_API_VERSION = 1.0 -- cgit v1.2.1