From 37bc1240469c9dfb95f0022da08843ba331f231c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 2 Jun 2014 21:07:09 +0300 Subject: Clarified prebuilt object documentation. --- test cases/prebuilt object/1 basic/meson.build | 4 ++-- test cases/prebuilt object/1 basic/mingw-i386.obj | Bin 0 -> 1652 bytes test cases/prebuilt object/1 basic/mingw.obj | Bin 1652 -> 0 bytes test cases/prebuilt object/1 basic/msvc-i386.obj | Bin 0 -> 2170 bytes test cases/prebuilt object/1 basic/msvc.obj | Bin 2170 -> 0 bytes test cases/prebuilt object/1 basic/readme.txt | 10 ++++++++++ 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 test cases/prebuilt object/1 basic/mingw-i386.obj delete mode 100644 test cases/prebuilt object/1 basic/mingw.obj create mode 100644 test cases/prebuilt object/1 basic/msvc-i386.obj delete mode 100644 test cases/prebuilt object/1 basic/msvc.obj create mode 100644 test cases/prebuilt object/1 basic/readme.txt 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-i386.obj b/test cases/prebuilt object/1 basic/mingw-i386.obj new file mode 100644 index 0000000..6e055e5 Binary files /dev/null and b/test cases/prebuilt object/1 basic/mingw-i386.obj differ diff --git a/test cases/prebuilt object/1 basic/mingw.obj b/test cases/prebuilt object/1 basic/mingw.obj deleted file mode 100644 index 6e055e5..0000000 Binary files a/test cases/prebuilt object/1 basic/mingw.obj and /dev/null differ diff --git a/test cases/prebuilt object/1 basic/msvc-i386.obj b/test cases/prebuilt object/1 basic/msvc-i386.obj new file mode 100644 index 0000000..a969a73 Binary files /dev/null and b/test cases/prebuilt object/1 basic/msvc-i386.obj differ diff --git a/test cases/prebuilt object/1 basic/msvc.obj b/test cases/prebuilt object/1 basic/msvc.obj deleted file mode 100644 index a969a73..0000000 Binary files a/test cases/prebuilt object/1 basic/msvc.obj and /dev/null differ 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 -- cgit v1.1