From c05ceedfcb3dceca7dc60503afebd1739415a1a0 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Wed, 26 Jun 2024 18:12:27 -0700 Subject: [PATCH] fix clang build --- build.bat | 2 +- src/df/core/df_core.h | 1 - src/raddbg/raddbg.h | 11 ++--------- src/ui/ui_core.h | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/build.bat b/build.bat index 6f21ceef..234a4f1c 100644 --- a/build.bat +++ b/build.bat @@ -43,7 +43,7 @@ if "%asan%"=="1" set auto_compile_flags=%auto_compile_flags% -fsanitize=add :: --- Compile/Link Line Definitions ------------------------------------------ set cl_common= /I..\src\ /I..\local\ /nologo /FC /Z7 -set clang_common= -I..\src\ -I..\local\ -gcodeview -fdiagnostics-absolute-paths -Wall -Wno-unknown-warning-option -Wno-missing-braces -Wno-unused-function -Wno-writable-strings -Wno-unused-value -Wno-unused-variable -Wno-unused-local-typedef -Wno-deprecated-register -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion -Wno-compare-distinct-pointer-types -Xclang -flto-visibility-public-std -D_USE_MATH_DEFINES -Dstrdup=_strdup -Dgnu_printf=printf +set clang_common= -I..\src\ -I..\local\ -gcodeview -fdiagnostics-absolute-paths -Wall -Wno-unknown-warning-option -Wno-missing-braces -Wno-unused-function -Wno-writable-strings -Wno-unused-value -Wno-unused-variable -Wno-unused-local-typedef -Wno-deprecated-register -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion -Wno-compare-distinct-pointer-types -Wno-initializer-overrides -Wno-incompatible-pointer-types-discards-qualifiers -Xclang -flto-visibility-public-std -D_USE_MATH_DEFINES -Dstrdup=_strdup -Dgnu_printf=printf set cl_debug= call cl /Od /Ob1 /DBUILD_DEBUG=1 %cl_common% %auto_compile_flags% set cl_release= call cl /O2 /DBUILD_DEBUG=0 %cl_common% %auto_compile_flags% set clang_debug= call clang -g -O0 -DBUILD_DEBUG=1 %clang_common% %auto_compile_flags% diff --git a/src/df/core/df_core.h b/src/df/core/df_core.h index 95825753..f4cb69d1 100644 --- a/src/df/core/df_core.h +++ b/src/df/core/df_core.h @@ -1365,7 +1365,6 @@ read_only global DF_Entity df_g_nil_entity = 0, 0, 0, - 0, // rjf: allocationless, simple equipment {0}, diff --git a/src/raddbg/raddbg.h b/src/raddbg/raddbg.h index ea8d9f09..7cf9d53b 100644 --- a/src/raddbg/raddbg.h +++ b/src/raddbg/raddbg.h @@ -2,24 +2,16 @@ // Licensed under the MIT license (https://opensource.org/license/mit/) //////////////////////////////// -//~ rjf: 0.9.11 TODO +//~ rjf: Frontend/UI Pass Tasks // // [ ] auto-scroll output window -// // [ ] inline breakpoint hit_count // [ ] to count hit counts, resolve all bps to addresses, check addresses // against stopper thread's -// -// [ ] colors: fill out rest of theme presets for new theme setup -// // [ ] editing multiple bindings for commands // [ ] theme lister -> fonts & font sizes // [ ] "Browse..." buttons should adopt a more relevant starting search path, // if possible - -//////////////////////////////// -//~ rjf: Frontend/UI Pass Tasks -// // [ ] move breakpoints to being a global thing, not nested to particular files // [ ] visualize all breakpoints everywhere - source view should show up in // disasm, disasm should show up in source view, function should show up in @@ -417,6 +409,7 @@ // [x] zooming behaves very strangely - sometimes it zooms source code, // sometimes both source code and menu/tab/watch font size, sometimes // just menu/tab/watch font size not source size. +// [x] colors: fill out rest of theme presets for new theme setup #ifndef RADDBG_H #define RADDBG_H diff --git a/src/ui/ui_core.h b/src/ui/ui_core.h index 26c4659c..2dc8c391 100644 --- a/src/ui/ui_core.h +++ b/src/ui/ui_core.h @@ -1023,7 +1023,7 @@ internal void ui_pop_corner_radius(void); #define UI_PrefSize(axis, v) DeferLoop(ui_push_pref_size((axis), (v)), ui_pop_pref_size(axis)) #define UI_CornerRadius(v) DeferLoop(ui_push_corner_radius(v), ui_pop_corner_radius()) #define UI_Focus(kind) DeferLoop((ui_push_focus_hot(kind), ui_push_focus_active(kind)), (ui_pop_focus_hot(), ui_pop_focus_active())) -#define UI_FlagsAdd(v) DeferLoop(ui_push_flags(ui_top_flags()|v), ui_pop_flags()) +#define UI_FlagsAdd(v) DeferLoop(ui_push_flags(ui_top_flags()|(v)), ui_pop_flags()) //- rjf: tooltip #define UI_TooltipBase DeferLoop(ui_tooltip_begin_base(), ui_tooltip_end_base())