diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-01-04 23:30:26 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-01-04 23:30:26 +0800 |
| commit | 3670e1ed6cfa08cd423fd2e93c054f02156b94c0 (patch) | |
| tree | e792348cc684057752aaa95d739587f3117b9443 | |
| parent | c65c0a614e60b8fbbc71a403d51d7a6d38fa0f4d (diff) | |
| download | gobject-introspection-3670e1ed6cfa08cd423fd2e93c054f02156b94c0.tar.gz | |
MSVC builds: Update NMake Makefiles for introspection
This updates the NMake Makefiles for:
-Removing the __pycache__ directory on clean, which is generated when
using Python 3.x, in the NMake Makefiles for building the main
introspection files.
-Building the giteststructinfo test program, as well as moving builds of
DLLs and EXEs to using inference rules when applicable, for the NMake
Makefiles that is used to build the tests.
| -rw-r--r-- | build/win32/gi-introspection-msvc.mak | 1 | ||||
| -rw-r--r-- | build/win32/gi-tests-msvc.mak | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/build/win32/gi-introspection-msvc.mak b/build/win32/gi-introspection-msvc.mak index 1a0a7030..5bcbaf37 100644 --- a/build/win32/gi-introspection-msvc.mak +++ b/build/win32/gi-introspection-msvc.mak @@ -189,4 +189,5 @@ clean: @-del /f/q gio_list @-del /f/q gobject_list @-del /f/q glib_list + @ if exist __pycache__ rmdir /s /q __pycache__ @-del /f/q *.pyc diff --git a/build/win32/gi-tests-msvc.mak b/build/win32/gi-tests-msvc.mak index c11c6b55..ba25a008 100644 --- a/build/win32/gi-tests-msvc.mak +++ b/build/win32/gi-tests-msvc.mak @@ -56,6 +56,7 @@ built_test_typelibs = \ test_programs = \ gitestrepo.exe \ gitestthrows.exe \ + giteststructinfo.exe \ gitypelibtest.exe \ gitestoffsets.exe @@ -83,8 +84,8 @@ offsets.dll: $(TOP_SRCDIR)\tests\offsets\offsets.c $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests /I$(TOP_SRCDIR)\tests\offsets $(TOP_SRCDIR)\tests\offsets\offsets.c $(LDFLAGS_DLL) @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2 -sletter.dll utility.dll gtkfrob.dll gettype.dll warnlib.dll typedefs.dll: - $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests $(TOP_SRCDIR)\tests\scanner\$*.c $(LDFLAGS_DLL) +{$(TOP_SRCDIR)\tests\scanner\}.c{}.dll: + $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests $< $(LDFLAGS_DLL) @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2 regress.dll: @@ -98,12 +99,12 @@ regress.dll: @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2 # Rules for test programs -gitestrepo.exe gitestthrows.exe gitypelibtest.exe: - $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository $(TOP_SRCDIR)\tests\repository\$*.c $(LDFLAGS) girepository-$(GI_APIVERSION).lib +{$(TOP_SRCDIR)\tests\repository\}.c{}.exe: + $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository $< $(LDFLAGS) girepository-$(GI_APIVERSION).lib @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1 -barapp.exe: - $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository -I$(TOP_SRCDIR)\tests $(TOP_SRCDIR)\tests\scanner\$*.c $(LDFLAGS) girepository-$(GI_APIVERSION).lib +{$(TOP_SRCDIR)\tests\scanner\}.c{}.exe: + $(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository -I$(TOP_SRCDIR)\tests $< $(LDFLAGS) girepository-$(GI_APIVERSION).lib @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1 gitestoffsets.exe: gitestoffsets.c |