From a64ffda688f1e194af344f0eb9bdf927552a4c02 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Dec 2014 16:47:25 +0100 Subject: {win32,android}/build.py: add the host triple to the lib paths Allow multiple targets to share a library directory tree. --- win32/build.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/build.py b/win32/build.py index 8a80b6318..889e862d6 100755 --- a/win32/build.py +++ b/win32/build.py @@ -8,6 +8,8 @@ import re configure_args = sys.argv[1:] +host_arch = 'i686-w64-mingw32' + # the path to the MPD sources mpd_path = os.path.dirname(os.path.dirname(sys.argv[0])) @@ -15,14 +17,14 @@ mpd_path = os.path.dirname(os.path.dirname(sys.argv[0])) lib_path = os.path.abspath('lib') tarball_path = lib_path src_path = os.path.join(lib_path, 'src') -build_path = os.path.join(lib_path, 'build') -root_path = os.path.join(lib_path, 'root') +arch_path = os.path.join(lib_path, host_arch) +build_path = os.path.join(arch_path, 'build') +root_path = os.path.join(arch_path, 'root') # redirect pkg-config to use our root directory instead of the default # one on the build host os.environ['PKG_CONFIG_LIBDIR'] = os.path.join(root_path, 'lib/pkgconfig') -host_arch = 'i686-w64-mingw32' gcc_toolchain = '/usr' def select_toolchain(): -- cgit v1.2.3