[pango] Visual Studio builds: Fix project file move to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Visual Studio builds: Fix project file move to win32/
- Date: Fri, 20 Jan 2017 10:11:11 +0000 (UTC)
commit f4cbd27f4e5bf8490ea411190d41813e14f12165
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jan 20 18:10:14 2017 +0800
Visual Studio builds: Fix project file move to win32/
Some more paths in auxillary scripts and NMake Makefiles need to be
updated as well...
win32/Makefile.msvc-introspection | 6 +++---
win32/introspection-msvc.mak | 2 +-
win32/pc_base.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
index 28e8b50..370bcb9 100644
--- a/win32/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -2,7 +2,7 @@
# Common autotools file for constructing the g-ir-scanner and
# g-ir-compiler command lines for Visual Studio builds.
-# This is copied from $(srcroot)/win32 from the gobject-introspection
+# This is copied from the gobject-introspection
# project, which may be included in projects that support both
# Visual Studio builds and introspection.
@@ -18,7 +18,7 @@
# is required unless --headers-only is specified in
# YourLib_1_0_gir__MSVC_SCANNERFLAGS)
#
-# include <this Makefile.msvc-introspection
+# include $(top_srcdir)/Makefile.msvc-introspection
# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
# YourLib_1_0_gir_VERSION = 1.0 # This is optional
@@ -83,7 +83,7 @@ $(top_builddir)/win32/$(_gir_name)_list:
for F in $(_gir_files_msvc); do \
case $$$$F in \
*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
- echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list
\
+ echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
;; \
esac; \
done
diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
index 8739844..26501f5 100644
--- a/win32/introspection-msvc.mak
+++ b/win32/introspection-msvc.mak
@@ -8,7 +8,7 @@
# Change or pass in or set the following to suit your environment
!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
!endif
!if ![setlocal] && \
diff --git a/win32/pc_base.py b/win32/pc_base.py
index 587ba83..285b6cd 100644
--- a/win32/pc_base.py
+++ b/win32/pc_base.py
@@ -23,7 +23,7 @@ class BasePCItems:
self.libdir = ''
self.prefix = ''
self.srcdir = os.path.dirname(__file__)
- self.top_srcdir = self.srcdir + '\\..\\..'
+ self.top_srcdir = self.srcdir + '\\..'
self.version = ''
def setup(self, argv, parser=None):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]