Skip to content

Commit c05ceed

Browse files
committed
fix clang build
1 parent 5e093a9 commit c05ceed

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if "%asan%"=="1" set auto_compile_flags=%auto_compile_flags% -fsanitize=add
4343

4444
:: --- Compile/Link Line Definitions ------------------------------------------
4545
set cl_common= /I..\src\ /I..\local\ /nologo /FC /Z7
46-
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
46+
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
4747
set cl_debug= call cl /Od /Ob1 /DBUILD_DEBUG=1 %cl_common% %auto_compile_flags%
4848
set cl_release= call cl /O2 /DBUILD_DEBUG=0 %cl_common% %auto_compile_flags%
4949
set clang_debug= call clang -g -O0 -DBUILD_DEBUG=1 %clang_common% %auto_compile_flags%

src/df/core/df_core.h

-1
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,6 @@ read_only global DF_Entity df_g_nil_entity =
13651365
0,
13661366
0,
13671367
0,
1368-
0,
13691368

13701369
// rjf: allocationless, simple equipment
13711370
{0},

src/raddbg/raddbg.h

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,16 @@
22
// Licensed under the MIT license (https://opensource.org/license/mit/)
33

44
////////////////////////////////
5-
//~ rjf: 0.9.11 TODO
5+
//~ rjf: Frontend/UI Pass Tasks
66
//
77
// [ ] auto-scroll output window
8-
//
98
// [ ] inline breakpoint hit_count
109
// [ ] to count hit counts, resolve all bps to addresses, check addresses
1110
// against stopper thread's
12-
//
13-
// [ ] colors: fill out rest of theme presets for new theme setup
14-
//
1511
// [ ] editing multiple bindings for commands
1612
// [ ] theme lister -> fonts & font sizes
1713
// [ ] "Browse..." buttons should adopt a more relevant starting search path,
1814
// if possible
19-
20-
////////////////////////////////
21-
//~ rjf: Frontend/UI Pass Tasks
22-
//
2315
// [ ] move breakpoints to being a global thing, not nested to particular files
2416
// [ ] visualize all breakpoints everywhere - source view should show up in
2517
// disasm, disasm should show up in source view, function should show up in
@@ -417,6 +409,7 @@
417409
// [x] zooming behaves very strangely - sometimes it zooms source code,
418410
// sometimes both source code and menu/tab/watch font size, sometimes
419411
// just menu/tab/watch font size not source size.
412+
// [x] colors: fill out rest of theme presets for new theme setup
420413

421414
#ifndef RADDBG_H
422415
#define RADDBG_H

src/ui/ui_core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ internal void ui_pop_corner_radius(void);
10231023
#define UI_PrefSize(axis, v) DeferLoop(ui_push_pref_size((axis), (v)), ui_pop_pref_size(axis))
10241024
#define UI_CornerRadius(v) DeferLoop(ui_push_corner_radius(v), ui_pop_corner_radius())
10251025
#define UI_Focus(kind) DeferLoop((ui_push_focus_hot(kind), ui_push_focus_active(kind)), (ui_pop_focus_hot(), ui_pop_focus_active()))
1026-
#define UI_FlagsAdd(v) DeferLoop(ui_push_flags(ui_top_flags()|v), ui_pop_flags())
1026+
#define UI_FlagsAdd(v) DeferLoop(ui_push_flags(ui_top_flags()|(v)), ui_pop_flags())
10271027

10281028
//- rjf: tooltip
10291029
#define UI_TooltipBase DeferLoop(ui_tooltip_begin_base(), ui_tooltip_end_base())

0 commit comments

Comments
 (0)