[retro-gtk] test: Only include toplevel header file
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] test: Only include toplevel header file
- Date: Sat, 11 Jan 2020 12:56:10 +0000 (UTC)
commit 4ba37efbcc78764b0e0583c6f73538027518132f
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Jan 6 20:28:24 2020 +0500
test: Only include toplevel header file
Avoid issues later after directory layout changes.
meson.build | 1 -
tests/meson.build | 10 ++++++----
tests/test-core.c | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index da4c4d2..df87791 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,6 @@ libdir = join_paths(prefix, get_option('libdir'))
libretrodir = join_paths(libdir, 'libretro')
confinc = include_directories('.')
-srcinc = include_directories('retro-gtk')
retro_gtk_version = meson.project_version()
retro_gtk_api_version = '0.14'
diff --git a/tests/meson.build b/tests/meson.build
index 61d303c..3d4ea2c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -16,7 +16,6 @@ retro_reftest = executable('retro-reftest',
retro_reftest_sources,
c_args: retro_gtk_c_args,
dependencies: retro_gtk_dep,
- include_directories: [ confinc, srcinc ],
install: get_option('install-tests'),
install_dir: installed_test_bindir,
)
@@ -47,6 +46,10 @@ build_conf.set('testlibretrodir', join_paths(meson.build_root(), 'tests'))
build_conf.set('testexecdir', join_paths(meson.build_root(), 'tests'))
build_conf.set('testdatadir', join_paths(meson.source_root(), 'tests'))
+test_c_args = [
+ '-DRETRO_GTK_USE_UNSTABLE_API',
+]
+
tests = [
['RetroCore', 'test-core', [], [retro_dummy_lib]],
]
@@ -58,9 +61,8 @@ foreach t : tests
test_args = t.get(3)
test_exe = executable(test_display_name, test_srcs,
- c_args: retro_gtk_c_args,
- dependencies: retro_gtk_deps,
- link_with: retro_gtk_lib,
+ c_args: test_c_args,
+ dependencies: retro_gtk_dep,
install: get_option('install-tests'),
install_dir: installed_test_bindir,
)
diff --git a/tests/test-core.c b/tests/test-core.c
index 5376448..5ff87c7 100644
--- a/tests/test-core.c
+++ b/tests/test-core.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../retro-gtk/retro-core.h"
+#include <retro-gtk.h>
static gchar *arg_core_filename = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]