From ad701a4bd7ea7022de1a1d975564f5a34bd1e22b Mon Sep 17 00:00:00 2001 From: hgn Date: Wed, 27 Sep 2023 16:06:02 +0100 Subject: [PATCH] compiler options --- submodules/SDL_GameControllerDB | 2 +- submodules/anyascii | 2 +- submodules/qoi | 2 +- submodules/stb | 2 +- vg.h | 12 +++++++++++- vg_imgui.h | 6 ++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/submodules/SDL_GameControllerDB b/submodules/SDL_GameControllerDB index c5b4df0..6ed8d05 160000 --- a/submodules/SDL_GameControllerDB +++ b/submodules/SDL_GameControllerDB @@ -1 +1 @@ -Subproject commit c5b4df0e1061175cb11e3ebbf8045178339864a5 +Subproject commit 6ed8d054340ee8a93a684e11360b66cd8a5c168e diff --git a/submodules/anyascii b/submodules/anyascii index eb5332d..44e971c 160000 --- a/submodules/anyascii +++ b/submodules/anyascii @@ -1 +1 @@ -Subproject commit eb5332d0b5e48d58397e6f27475a18e058330d23 +Subproject commit 44e971c774d9ec67ca6c1f16c5a476724821ab63 diff --git a/submodules/qoi b/submodules/qoi index dfc056e..b8d77df 160000 --- a/submodules/qoi +++ b/submodules/qoi @@ -1 +1 @@ -Subproject commit dfc056e813c98d307238d35f7f041a725d699dfc +Subproject commit b8d77df1e80b652a57f0b7270449b179a6b91f40 diff --git a/submodules/stb b/submodules/stb index 5736b15..8b5f1f3 160000 --- a/submodules/stb +++ b/submodules/stb @@ -1 +1 @@ -Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 +Subproject commit 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 diff --git a/vg.h b/vg.h index 2acdfc5..a89efaf 100644 --- a/vg.h +++ b/vg.h @@ -67,7 +67,9 @@ #include "vg_m.h" #include "vg_io.h" #include "vg_log.h" +#ifndef VG_NO_STEAM #include "vg_steam.h" +#endif //#define VG_SYNC_DEBUG #ifdef VG_SYNC_DEBUG @@ -228,7 +230,9 @@ VG_STATIC void vg_checkgl( const char *src_info ); #include "vg_console.h" #include "vg_profiler.h" -#include "vg_audio.h" +#ifndef VG_NO_AUDIO + #include "vg_audio.h" +#endif #include "vg_shader.h" #include "vg_tex.h" #include "vg_input.h" @@ -290,7 +294,9 @@ VG_STATIC void _vg_load_full( void *data ) /* internal */ vg_loader_step( vg_input_init, vg_input_free ); vg_loader_step( vg_lines_init, NULL ); +#ifndef VG_NO_AUDIO vg_loader_step( vg_audio_init, vg_audio_free ); +#endif vg_loader_step( vg_profiler_init, NULL ); vg_async_call( async_internal_complete, NULL, 0 ); @@ -441,7 +447,9 @@ VG_STATIC void _vg_gameloop_render(void) else vg_gui(); /* vg tools */ +#ifndef VG_NO_AUDIO audio_debug_ui( vg.pv ); +#endif /* profiling */ int frame_target = vg.display_refresh_rate; @@ -664,7 +672,9 @@ VG_STATIC void _vg_init_window( const char *window_name ) exit(0); } +#ifndef VG_NO_AUDIO SDL_InitSubSystem( SDL_INIT_AUDIO ); +#endif SDL_InitSubSystem( SDL_INIT_GAMECONTROLLER ); char *exe_basepath = SDL_GetBasePath(); diff --git a/vg_imgui.h b/vg_imgui.h index b95e314..e58977b 100644 --- a/vg_imgui.h +++ b/vg_imgui.h @@ -984,6 +984,12 @@ static void ui_standard_widget( ui_rect inout_panel, ui_rect out_rect, out_rect, inout_panel ); } +static void ui_info( ui_rect inout_panel, const char *text ){ + ui_rect box; + ui_standard_widget( inout_panel, box, 1 ); + ui_text( box, text, 1, k_ui_align_middle_left, 0 ); +} + static void ui_image( ui_rect rect, GLuint image ){ ui_flush( k_ui_shader_colour ); glActiveTexture( GL_TEXTURE0 ); -- 2.25.1