diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-04 12:44:49 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-04 12:44:49 +0800 |
| commit | 3b826841924275e41e98635078419e8ca3ce5f00 (patch) | |
| tree | ad519255b24933eff0d8c98c87b0ac0dbd66e591 /build/gi-introspection-msvc.mak | |
| parent | 56b53e3e1360868ee7da36a6d9d13561387c48d2 (diff) | |
| download | gobject-introspection-3b826841924275e41e98635078419e8ca3ce5f00.tar.gz | |
MSVC Builds: Add NMake Makefiles to Build the Tests
This adds NMake Makefiles for one to build the tests for Visual Studio
builds, which is not done with an MSYS shell. Shared items from the
existing NMake Makefiles for building the introspection files, which are
also used to build the tests, are split out into common NMake Makefiles,
which are then included.
This also means that we do not need to include the test_gir_cmd.txt for
people to look at when building the tests as the NMake Makefiles will do
the job for them, which cover the material there.
Diffstat (limited to 'build/gi-introspection-msvc.mak')
| -rw-r--r-- | build/gi-introspection-msvc.mak | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/build/gi-introspection-msvc.mak b/build/gi-introspection-msvc.mak index 3729c6f8..9dbbd881 100644 --- a/build/gi-introspection-msvc.mak +++ b/build/gi-introspection-msvc.mak @@ -6,24 +6,7 @@ CAIROGOBJECT_DLLNAME= cairo-gobject-vs$(VSVER) # Please do not change anything after this line -!include detectenv_msvc.mak - -GI_APIVERSION = 1.0 -GLIB_APIVERSION = 2.0 - -CHECK_PACKAGE = gio-$(GLIB_APIVERSION) - -!include introspection-msvc.mak - -BINDIR = ..\build\win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin -G_IR_SCANNER_CURRENT = ..\tools\g-ir-scanner -G_IR_COMPILER_CURRENT = $(BINDIR)\g-ir-compiler.exe - -!if "$(PLAT)" == "x64" -TIME_T_DEFINE = -Dtime_t=long long -!else -TIME_T_DEFINE = -Dtime_t=long -!endif +!include gi-build-common-msvc.mak # The .gir's that are in $(srcroot)/gir, applicable to Windows # cairo-1.0.gir is not listed as it needs to be processed first @@ -60,18 +43,10 @@ built_install_typelibs = \ Gio-$(GLIB_APIVERSION).typelib \ GIRepository-$(GLIB_APIVERSION).typelib -!include introspection-msvc.mak - !if "$(BUILD_INTROSPECTION)" == "TRUE" all: setgirbuildnev $(built_install_girs) $(built_install_typelibs) $(bundled_girs) $(bundled_typelibs) -setgirbuildnev: - @set CC=$(CC) - @set PYTHONPATH=..;$(BINDIR) - @set PATH=$(BINDIR);$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin - @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\lib;$(LIB) - @set UNINSTALLED_INTROSPECTION_SRCDIR=.. +!include gi-setenv-msvc.mak glib_list: @-echo Generating file list for GLib... |