meson: use symlinks for locating headers

This avoids crossing the "subproject sandbox", on which meson complains.
dosemu2 · Dec 6, 2023 · 51aa112 · 51aa112
1 parent b792a2a
commit 51aa112
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/fdpp/hdr b/fdpp/hdr
@@ -0,0 +1 @@
+../hdr
diff --git a/fdpp/include b/fdpp/include
@@ -0,0 +1 @@
+../include
diff --git a/fdpp/meson.build b/fdpp/meson.build
@@ -8,7 +8,7 @@ tg = subproject('thunk_gen')
 TG = tg.get_variable('TG')
 TFLAGS = ['-a', '2', '-p', '2']
 SRC = TOP / 'kernel'
-rel_inc = TOP / 'include/fdpp'
+rel_inc = 'include/fdpp'
 abs_inc = meson.current_source_dir() / rel_inc
 incdir = include_directories(rel_inc)
 cpp = meson.get_compiler('c')
@@ -62,7 +62,7 @@ ccfiles = ccgen.process(CFILES)
 
 gad = custom_target('glob_asmdefs.h',
   output: 'glob_asmdefs.h',
-  input: SRC / 'glob_asm.h',
+  input: 'src/glob_asm.h',
   command: [MA, '@INPUT@'],
   capture: true)
 
@@ -136,7 +136,7 @@ ppccf = ccgen.process(FDPP_CFILES)
 FDPP_CCFILES = ['thunks.cc', 'thunks_c.cc', 'thunks_a.cc', 'thunks_p.cc',
   'dosobj.cc']
 CPPFILES = ['objhlp.cpp', 'ctors.cpp', 'farhlp.cpp', 'objtrace.cpp']
-hdr = [TOP / 'kernel', TOP / 'hdr', TOP / 'fdpp', rel_inc]
+hdr = ['src', 'hdr', '.', rel_inc]
 incdir2 = include_directories(hdr)
 shared_library('fdpp', [ccfiles, ppccf, FDPP_CCFILES, CPPFILES],
   include_directories: incdir2,

diff --git a/fdpp/src b/fdpp/src
@@ -0,0 +1 @@
+../kernel