From fd56d94401b6923f350128ef1822751bfaeadcde Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 22 Jul 2015 18:01:07 +0800 Subject: build/gi-inrtospection-msvc.mak: Allow Libtool Style Names ...for the cairo-1.0.gir, as there may be still people that prefer to use it, for some reason. For the GLib and GI DLLs, the DLL name is deduced from the --library argument (i.e. the filename of the .lib) passed in to g-ir-scanner, so that part is not affected by this change. --- build/gi-introspection-msvc.mak | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/gi-introspection-msvc.mak b/build/gi-introspection-msvc.mak index 9dbbd881..d439ef44 100644 --- a/build/gi-introspection-msvc.mak +++ b/build/gi-introspection-msvc.mak @@ -2,7 +2,11 @@ # Change or pass in as a variable/env var if needed # The main DLLs that are used to build introspection files that are "installed" -CAIROGOBJECT_DLLNAME= cairo-gobject-vs$(VSVER) +!if "$(USE_LIBTOOL_NAME)" == "1" +CAIROGOBJECT_DLLNAME = libcairo-gobject-2 +!else +CAIROGOBJECT_DLLNAME = cairo-gobject-vs$(VSVER) +!endif # Please do not change anything after this line -- cgit v1.2.1