switch to thunk_gen-1.2

fdpp/farptr.hpp

@@ -752,7 +752,8 @@ class SymMembT : public MembBase<T, P, M, O> {
 #define __ASMREF(f) f.get_ref()
 #define __ASMADDR(v) __##v.get_addr()
 #define __ASMCALL(f) AsmCSym f
-#define __ASYM(x) x.get_sym()
+#define __ASYM(x) __##x.get_sym()
+#define __ASYM_L(x) __##x.get_sym()
 #define ASMREF(t) AsmRef<t>
 #if CLANG_VER < 14
 #define DUMMY_MARK(p, n) \

fdpp/makefile

@@ -158,14 +158,18 @@ ifeq ($(filter clean,$(MAKECMDGOALS)),)
 $(error thunk_gen not installed)
 endif
 else
+ifeq ($(filter clean,$(MAKECMDGOALS)),)
+$(shell pkg-config --atleast-version=1.2 thunk_gen)
+ifneq ($(.SHELLSTATUS),0)
+$(error thunk_gen is too old, 1.2 is needed)
+endif
+endif
 TFLAGS = -a 2 -p 2
 PDHDR = $(SRC)/proto.h
+GLOB_ASM = $(SRC)/glob_asm.h
 include $(TGMK)
 endif
 
-glob_asmdefs.h: $(SRC)/glob_asm.h
-	$(srcdir)/parsers/mkasmdefs.sh $< >$@
-
 INSTALL ?= install
 install: $(ALL)
 	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/fdpp

fdpp/meson.build

@@ -2,10 +2,10 @@ project('libfdpp', ['c', 'cpp'], default_options: ['cpp_std=c++20'],
   version: '0.1', meson_version: '>= 1.3.0')
 
 MF = meson.current_source_dir() / 'parsers/mkfar.sh'
-MA = meson.current_source_dir() / 'parsers/mkasmdefs.sh'
 PD = meson.current_source_dir() / 'parsers/parse_decls.sh'
 tg = dependency('thunk_gen')
 TG = tg.get_variable(pkgconfig: 'binary')
+MA = tg.get_variable(pkgconfig: 'mkadscript')
 TGS = tg.get_variable(pkgconfig: 'tgscript')
 TGM4 = tg.get_variable(pkgconfig: 'm4script')
 TFLAGS = ['-a', '2', '-p', '2']