diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-17 16:47:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-17 19:28:49 +0100 |
| commit | a64ffda688f1e194af344f0eb9bdf927552a4c02 (patch) | |
| tree | 71fdf0192a890e5bf3abf819d5ad14127f0ce145 /win32 | |
| parent | 8400da9934df3e61f0dc792c7f9ce311b0103b39 (diff) | |
| download | mpd-a64ffda688f1e194af344f0eb9bdf927552a4c02.tar.gz mpd-a64ffda688f1e194af344f0eb9bdf927552a4c02.tar.xz mpd-a64ffda688f1e194af344f0eb9bdf927552a4c02.zip | |
{win32,android}/build.py: add the host triple to the lib paths
Allow multiple targets to share a library directory tree.
Diffstat (limited to 'win32')
| -rwxr-xr-x | win32/build.py | 8 |
1 files changed, 5 insertions, 3 deletions
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(): |