aboutsummaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-07-25 22:01:25 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-07-27 00:54:40 +0300
commiteb3cdb6f8d380da19231affd176deb8088481a5a (patch)
tree55a5a10f0b32471ddb1f337579609c999c792aa4 /cross
parent6af21dd20e02f7b4287c355f8ed2d8605670ad9c (diff)
downloadmeson-eb3cdb6f8d380da19231affd176deb8088481a5a.zip
meson-eb3cdb6f8d380da19231affd176deb8088481a5a.tar.gz
meson-eb3cdb6f8d380da19231affd176deb8088481a5a.tar.bz2
Changed cross compilation file to new format.
Diffstat (limited to 'cross')
-rw-r--r--cross/ubuntu-armhf.txt11
-rw-r--r--cross/ubuntu-mingw.txt14
2 files changed, 22 insertions, 3 deletions
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
index 2d2ee62..273d293 100644
--- a/cross/ubuntu-armhf.txt
+++ b/cross/ubuntu-armhf.txt
@@ -1,11 +1,14 @@
-name = 'linux'
+[binaries]
+# we could set exe_wrapper = qemu-arm-static but to test the case
+# when cross compiled binaries can't be built we don't do that
c = '/usr/bin/arm-linux-gnueabihf-gcc'
cpp = '/usr/bin/arm-linux-gnueabihf-g++'
ar = '/usr/arm-linux-gnueabihf/bin/ar'
strip = '/usr/arm-linux-gnueabihf/bin/strip'
+pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
+[properties]
root = '/usr/arm-linux-gnueabihf'
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
sizeof_int = 4
sizeof_wchar_t = 4
@@ -17,3 +20,7 @@ alignment_double = 4 # Don't know if this is correct...
has_function_printf = true
has_function_hfkerhisadf = false
+
+[hostmachine]
+name = 'linux'
+cpu = 'arm'
diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt
index 76a15a8..248151f 100644
--- a/cross/ubuntu-mingw.txt
+++ b/cross/ubuntu-mingw.txt
@@ -1,8 +1,20 @@
-name = 'windows'
+# Something crazy: compiling on Linux a crosscompiler that
+# runs on Windows and generates code for iOS.
+
+[binaries]
exe_wrapper = 'wine' # A command used to run generated executables.
c = '/usr/bin/i686-w64-mingw32-gcc'
cpp = '/usr/bin/i686-w64-mingw32-g++'
ar = '/usr/bin/i686-w64-mingw32-ar'
strip = '/usr/bin/i686-w64-mingw32-strip'
+[properties]
root = '/usr/i686-w64-mingw32'
+
+[hostmachine]
+name = 'windows'
+cpu = 'x86'
+
+[targetmachine]
+name='darwin'
+cpu='arm'