Skip to content

Commit ebe6553

Browse files
author
Vano
committed
+internal class macro, + -Ipath to scons script
1 parent 499ba3f commit ebe6553

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cppscript.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def __call__(self, scons_env, source, call_args, *args, **kwargs):
2424
'header_dir' : env['header_dir'],
2525
'gen_dir' : env['gen_dir'],
2626
'compile_defs' : {f'{i[0]}={i[1]}' if type(i) is tuple else str(i) for i in env.get('compile_defs', [])},
27-
'include_paths' : {cppscript_src}.union({str(path) for path in env.get('include_paths', [])}),
27+
'include_paths' : {cppscript_src, env['header_dir']}.union({str(path) for path in env.get('include_paths', [])}),
2828
'auto_methods' : env['auto_methods']
2929
}
3030

@@ -303,7 +303,7 @@ def parse_cursor(parent):
303303
elif cursor.spelling in INIT_LEVELS:
304304
keyword_macros.append(cursor)
305305

306-
elif cursor.spelling in ['GCLASS', 'GVIRTUAL_CLASS', 'GABSTRACT_CLASS']:
306+
elif cursor.spelling in ['GCLASS', 'GVIRTUAL_CLASS', 'GABSTRACT_CLASS', 'GINTERNAL_CLASS']:
307307
classes_and_Gmacros.append(cursor)
308308

309309
case _:

src/cppscript_defs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ GSETGET_ ## CLASS_NAME \
1616

1717
#define GVIRTUAL_CLASS(CLASS_NAME, CLASS_NAME_INH) GCLASS(CLASS_NAME, CLASS_NAME_INH)
1818
#define GABSTRACT_CLASS(CLASS_NAME, CLASS_NAME_INH) GCLASS(CLASS_NAME, CLASS_NAME_INH)
19+
#define GINTERNAL_CLASS(CLASS_NAME, CLASS_NAME_INH) GCLASS(CLASS_NAME, CLASS_NAME_INH)
1920

2021
#define GENERATE_GETTER_DECLARATION(function, property) \
2122
decltype(property) function();

0 commit comments

Comments
 (0)