[gjs/introspection.nmake] win32/NMake: Fix introspection builds

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

commit f1564e6370b5faf0cc1b88481a0e25a4322e6926
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 5 12:14:13 2019 +0800

    win32/NMake: Fix introspection builds
    
    There is an extraneous set of CFlags that was passed into the
    g-ir-scanner command line, which was causing the build of
    GjsPrivate-1.0.gir to fail.  Plus, during the previous update to this
    file, the g-ir-compiler line was updated incorrectly, so fix that as
    well.
    
    This will fix introspection builds on NMake/Visual Studio builds of GJS.

 win32/gjs-introspection-msvc.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/win32/gjs-introspection-msvc.mak b/win32/gjs-introspection-msvc.mak
index 02b1cbb5..b772ea26 100644
--- a/win32/gjs-introspection-msvc.mak
+++ b/win32/gjs-introspection-msvc.mak
@@ -18,7 +18,7 @@ vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir: vs$(VSVER)\$(CFG)\$(PLAT)\gjs.lib
        --add-include-path=$(G_IR_INCLUDEDIR)           \
        --pkg-export=gjs                                \
        --cflags-begin                                  \
-       $(CFLAGS) $(LIBGJS_CFLAGS_BASE)                 \
+       $(LIBGJS_CFLAGS_BASE)                           \
        --cflags-end                                    \
        --filelist=vs$(VSVER)\$(CFG)\$(PLAT)\libgjs\gjs_private_list    \
        -L.\vs$(VSVER)\$(CFG)\$(PLAT)   \
@@ -27,7 +27,7 @@ vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir: vs$(VSVER)\$(CFG)\$(PLAT)\gjs.lib
 vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir
        $(PREFIX)\bin\g-ir-compiler                     \
        --includedir=vs$(VSVER)\$(CFG)\$(PLAT) --debug --verbose        \
-       $(**:\=/).gir                                   \
+       $(**:\=/)                                       \
        -o $@
 !else
 !error $(ERROR_MSG)