compiler options
authorhgn <hgodden00@gmail.com>
Wed, 27 Sep 2023 15:06:02 +0000 (16:06 +0100)
committerhgn <hgodden00@gmail.com>
Wed, 27 Sep 2023 15:06:02 +0000 (16:06 +0100)
submodules/SDL_GameControllerDB
submodules/anyascii
submodules/qoi
submodules/stb
vg.h
vg_imgui.h

index c5b4df0e1061175cb11e3ebbf8045178339864a5..6ed8d054340ee8a93a684e11360b66cd8a5c168e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c5b4df0e1061175cb11e3ebbf8045178339864a5
+Subproject commit 6ed8d054340ee8a93a684e11360b66cd8a5c168e
index eb5332d0b5e48d58397e6f27475a18e058330d23..44e971c774d9ec67ca6c1f16c5a476724821ab63 160000 (submodule)
@@ -1 +1 @@
-Subproject commit eb5332d0b5e48d58397e6f27475a18e058330d23
+Subproject commit 44e971c774d9ec67ca6c1f16c5a476724821ab63
index dfc056e813c98d307238d35f7f041a725d699dfc..b8d77df1e80b652a57f0b7270449b179a6b91f40 160000 (submodule)
@@ -1 +1 @@
-Subproject commit dfc056e813c98d307238d35f7f041a725d699dfc
+Subproject commit b8d77df1e80b652a57f0b7270449b179a6b91f40
index 5736b15f7ea0ffb08dd38af21067c314d6a3aae9..8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9
+Subproject commit 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55
diff --git a/vg.h b/vg.h
index 2acdfc529053caef494352933b74530a909fcb0c..a89efaf7569fc2f19d5ed55f999f7a6245079b21 100644 (file)
--- 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();
index b95e3143d806bf09692ce4f83b19d704e140e831..e58977b41f25fa09d57b7bc844d3ea68666b0016 100644 (file)
@@ -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 );