diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-02 21:07:09 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-02 21:07:09 +0300 |
commit | 37bc1240469c9dfb95f0022da08843ba331f231c (patch) | |
tree | 1fe5bd426588688cb2acf5a43f0a745485ae5d6c | |
parent | ac871dd6e273fb82757a45b201895b2cbf69e6c3 (diff) | |
download | meson-37bc1240469c9dfb95f0022da08843ba331f231c.zip meson-37bc1240469c9dfb95f0022da08843ba331f231c.tar.gz meson-37bc1240469c9dfb95f0022da08843ba331f231c.tar.bz2 |
Clarified prebuilt object documentation.
-rw-r--r-- | test cases/prebuilt object/1 basic/meson.build | 4 | ||||
-rw-r--r-- | test cases/prebuilt object/1 basic/mingw-i386.obj (renamed from test cases/prebuilt object/1 basic/mingw.obj) | bin | 1652 -> 1652 bytes | |||
-rw-r--r-- | test cases/prebuilt object/1 basic/msvc-i386.obj (renamed from test cases/prebuilt object/1 basic/msvc.obj) | bin | 2170 -> 2170 bytes | |||
-rw-r--r-- | test cases/prebuilt object/1 basic/readme.txt | 10 |
4 files changed, 12 insertions, 2 deletions
diff --git a/test cases/prebuilt object/1 basic/meson.build b/test cases/prebuilt object/1 basic/meson.build index 265a18e..1e78bb8 100644 --- a/test cases/prebuilt object/1 basic/meson.build +++ b/test cases/prebuilt object/1 basic/meson.build @@ -26,9 +26,9 @@ elif host.name() == 'freebsd' elif host.name() == 'windows' id = meson.get_compiler('c').get_id() if id == 'gcc' - object = 'mingw.obj' + object = 'mingw-i386.obj' elif id == 'msvc' - object = 'msvc.obj' + object = 'msvc-i386.obj' else error('Unknown compiler.') endif diff --git a/test cases/prebuilt object/1 basic/mingw.obj b/test cases/prebuilt object/1 basic/mingw-i386.obj Binary files differindex 6e055e5..6e055e5 100644 --- a/test cases/prebuilt object/1 basic/mingw.obj +++ b/test cases/prebuilt object/1 basic/mingw-i386.obj diff --git a/test cases/prebuilt object/1 basic/msvc.obj b/test cases/prebuilt object/1 basic/msvc-i386.obj Binary files differindex a969a73..a969a73 100644 --- a/test cases/prebuilt object/1 basic/msvc.obj +++ b/test cases/prebuilt object/1 basic/msvc-i386.obj diff --git a/test cases/prebuilt object/1 basic/readme.txt b/test cases/prebuilt object/1 basic/readme.txt new file mode 100644 index 0000000..a7acb4f --- /dev/null +++ b/test cases/prebuilt object/1 basic/readme.txt @@ -0,0 +1,10 @@ +This test checks that a pre-existing object file can be used in projects. +In order to do this, we need prebuilt objects in the source dir. To enable +a new platform, the source file source.c needs to be compiled and then +the Meson file updated to use it. + +The object needs to be built with no optimization and debug symbols enabled. +As an example, this is what a compile command with Gcc on x86 Linux would +look like: + +gcc -c -g -o linux-i386.o source.c |