[gobject-introspection] MSVC builds: Prepare NMake Makefiles for MSVC project inclusion

[Chun-wei Fan <fanchunwei src gnome org>]

commit 0d361ced9e73e9066ca872d581d598f5033f9f59
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 15 00:35:30 2016 +0800

    MSVC builds: Prepare NMake Makefiles for MSVC project inclusion
    
    Allow the CFG parameter to accept "Debug" and "Release", as this is the
    convention of the project files of Visual Studio.  Also use TOP_SRCDIR
    everywhere rather than hard-coding '..\..' for it.

 build/win32/detectenv-msvc.mak       |    4 ++--
 build/win32/gi-build-common-msvc.mak |    7 ++++---
 build/win32/gi-setenv-msvc.mak       |    6 +++---
 build/win32/introspection-msvc.mak   |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/build/win32/detectenv-msvc.mak b/build/win32/detectenv-msvc.mak
index c23e444..61f979d 100644
--- a/build/win32/detectenv-msvc.mak
+++ b/build/win32/detectenv-msvc.mak
@@ -55,7 +55,7 @@ version is not supported.
 !endif
 
 VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
 VALID_CFGSET = TRUE
 !endif
 
@@ -63,7 +63,7 @@ VALID_CFGSET = TRUE
 # using .pdb files for release builds
 CFLAGS_BASE = /Zi
 
-!if "$(CFG)" == "release"
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
 CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
 !else
 CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
diff --git a/build/win32/gi-build-common-msvc.mak b/build/win32/gi-build-common-msvc.mak
index 6d108ea..e122003 100644
--- a/build/win32/gi-build-common-msvc.mak
+++ b/build/win32/gi-build-common-msvc.mak
@@ -12,7 +12,8 @@ CHECK_PACKAGE = gio-$(GLIB_APIVERSION)
 !include introspection-msvc.mak
 
 BINDIR = 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
 TOP_SRCDIR = ..\..
+
+G_IR_SCANNER_CURRENT = $(TOP_SRCDIR)\tools\g-ir-scanner
+G_IR_DOC_TOOL_CURRENT = $(TOP_SRCDIR)\tools\g-ir-doc-tool
+G_IR_COMPILER_CURRENT = $(BINDIR)\g-ir-compiler.exe
diff --git a/build/win32/gi-setenv-msvc.mak b/build/win32/gi-setenv-msvc.mak
index 4db6f3f..6cfae3a 100644
--- a/build/win32/gi-setenv-msvc.mak
+++ b/build/win32/gi-setenv-msvc.mak
@@ -4,9 +4,9 @@
 # Please do not change anything after this line
 
 setgirbuildenv:
-       @set UNINSTALLED_INTROSPECTION_SRCDIR=..\..
-       @set UNINSTALLED_INTROSPECTION_BUILDDIR=..\..
-       @set PYTHONPATH=..\..;$(BINDIR)
+       @set UNINSTALLED_INTROSPECTION_SRCDIR=$(TOP_SRCDIR)
+       @set UNINSTALLED_INTROSPECTION_BUILDDIR=$(TOP_SRCDIR)
+       @set PYTHONPATH=$(TOP_SRCDIR);$(BINDIR)
        @set PATH=$(BINDIR);$(PREFIX)\bin;$(PATH)
        @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
        @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\lib;$(LIB)
diff --git a/build/win32/introspection-msvc.mak b/build/win32/introspection-msvc.mak
index 6b58293..f6fff49 100644
--- a/build/win32/introspection-msvc.mak
+++ b/build/win32/introspection-msvc.mak
@@ -74,7 +74,7 @@ VALID_PKG_CONFIG_PATH = FALSE
 !endif
 
 VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
 VALID_CFGSET = TRUE
 !endif