get linux building again

src/base/base_markup.h

@@ -6,6 +6,9 @@
 
 #define RADDBG_MARKUP_IMPLEMENTATION
 #define RADDBG_MARKUP_VSNPRINTF raddbg_vsnprintf
+#if OS_LINUX
+# define RADDBG_MARKUP_STUBS
+#endif
 #include "lib_raddbg_markup/raddbg_markup.h"
 
 #if !defined(LAYER_COLOR)

src/eval/eval_core.h

@@ -884,12 +884,6 @@ struct E_UsedExprMap
 
 //- rjf: type key -> auto hook expression list cache
 
-typedef struct E_TypeAutoHookMatch E_TypeAutoHookMatch;
-struct E_TypeAutoHookMatch
-{
-  String8 expr;
-};
-
 typedef struct E_TypeAutoHookCacheNode E_TypeAutoHookCacheNode;
 struct E_TypeAutoHookCacheNode
 {

src/lib_raddbg_markup/raddbg_markup.h

@@ -51,8 +51,8 @@
 # define raddbg_watch(fmt, ...)                       ((void)0)
 # define raddbg_pin(expr, ...)
 # define raddbg_log(fmt, ...)                         ((void)0)
-# define raddbg_entry_point(...)                      struct raddbg_gen_data_id(){int __unused__}
+# define raddbg_entry_point(...)                      struct raddbg_gen_data_id(){int __unused__;}
-# define raddbg_type_view(type, ...)                  struct raddbg_gen_data_id(){int __unused__}
+# define raddbg_type_view(type, ...)                  struct raddbg_gen_data_id(){int __unused__;}
 # define raddbg_add_breakpoint(ptr, size, r, w, x)    ((void)0)
 # define raddbg_remove_breakpoint(ptr, size, r, w, x) ((void)0)
 #endif

src/metagen/metagen_os/core/linux/metagen_os_core_linux.c

@@ -447,6 +447,7 @@ internal B32
 os_move_file_path(String8 dst, String8 src)
 {
   // TODO(rjf)
+  return 0;
 }
 
 internal String8

src/mule/mule_main.cpp

@@ -9,6 +9,9 @@
 #include <string>
 #include <vector>
 #include <memory>
+#if !_WIN32
+# define RADDBG_MARKUP_STUBS
+#endif
 #define RADDBG_MARKUP_IMPLEMENTATION
 #include "lib_raddbg_markup/raddbg_markup.h"
 

src/os/core/linux/os_core_linux.c

@@ -447,6 +447,7 @@ internal B32
 os_move_file_path(String8 dst, String8 src)
 {
   // TODO(rjf)
+  return 0;
 }
 
 internal String8

src/os/gfx/linux/os_gfx_linux.c

@@ -137,7 +137,7 @@ os_window_close(OS_Handle handle)
 }
 
 internal void
-os_window_set_title(OS_Handle window, String8 title)
+os_window_set_title(OS_Handle handle, String8 title)
 {
   if(os_handle_match(handle, os_handle_zero())) {return;}
   // TODO(rjf)
@@ -191,13 +191,14 @@ os_window_set_maximized(OS_Handle handle, B32 maximized)
 }
 
 internal B32
-os_window_is_minimized(OS_Handle window)
+os_window_is_minimized(OS_Handle handle)
 {
   if(os_handle_match(handle, os_handle_zero())) {return 0;}
+  return 0;
 }
 
 internal void
-os_window_set_minimized(OS_Handle window, B32 minimized)
+os_window_set_minimized(OS_Handle handle, B32 minimized)
 {
   if(os_handle_match(handle, os_handle_zero())) {return;}
 }
@@ -324,10 +325,10 @@ os_get_events(Arena *arena, B32 wait)
       case KeyRelease:
       {
         // rjf: determine flags
-        OS_Modifiers flags = 0;
+        OS_Modifiers modifiers = 0;
-        if(evt.xkey.state & ShiftMask)   { flags |= OS_Modifier_Shift; }
+        if(evt.xkey.state & ShiftMask)   { modifiers |= OS_Modifier_Shift; }
-        if(evt.xkey.state & ControlMask) { flags |= OS_Modifier_Ctrl; }
+        if(evt.xkey.state & ControlMask) { modifiers |= OS_Modifier_Ctrl; }
-        if(evt.xkey.state & Mod1Mask)    { flags |= OS_Modifier_Alt; }
+        if(evt.xkey.state & Mod1Mask)    { modifiers |= OS_Modifier_Alt; }
         
         // rjf: map keycode -> keysym
         U32 keysym = XLookupKeysym(&evt.xkey, 0);
@@ -386,7 +387,7 @@ os_get_events(Arena *arena, B32 wait)
         OS_LNX_Window *window = os_lnx_window_from_x11window(evt.xclient.window);
         OS_Event *e = os_event_list_push_new(arena, &evts, evt.type == KeyPress ? OS_EventKind_Press : OS_EventKind_Release);
         e->window.u64[0] = (U64)window;
-        e->flags = flags;
+        e->modifiers = modifiers;
         e->key = key;
       }break;
       
@@ -395,10 +396,10 @@ os_get_events(Arena *arena, B32 wait)
       case ButtonRelease:
       {
         // rjf: determine flags
-        OS_Modifiers flags = 0;
+        OS_Modifiers modifiers = 0;
-        if(evt.xbutton.state & ShiftMask)   { flags |= OS_Modifier_Shift; }
+        if(evt.xbutton.state & ShiftMask)   { modifiers |= OS_Modifier_Shift; }
-        if(evt.xbutton.state & ControlMask) { flags |= OS_Modifier_Ctrl; }
+        if(evt.xbutton.state & ControlMask) { modifiers |= OS_Modifier_Ctrl; }
-        if(evt.xbutton.state & Mod1Mask)    { flags |= OS_Modifier_Alt; }
+        if(evt.xbutton.state & Mod1Mask)    { modifiers |= OS_Modifier_Alt; }
         
         // rjf: map button -> OS_Key
         OS_Key key = OS_Key_Null;
@@ -414,7 +415,7 @@ os_get_events(Arena *arena, B32 wait)
         OS_LNX_Window *window = os_lnx_window_from_x11window(evt.xclient.window);
         OS_Event *e = os_event_list_push_new(arena, &evts, evt.type == ButtonPress ? OS_EventKind_Press : OS_EventKind_Release);
         e->window.u64[0] = (U64)window;
-        e->flags = flags;
+        e->modifiers = modifiers;
         e->key = key;
       }break;
       

src/scratch/ryan_scratch.c

@@ -19,28 +19,10 @@
 //- rjf: [h]
 #include "base/base_inc.h"
 #include "os/os_inc.h"
-#include "rdi_make/rdi_make_local.h"
-#include "coff/coff.h"
-#include "codeview/codeview.h"
-#include "codeview/codeview_stringize.h"
-#include "msf/msf.h"
-#include "msf/msf_parse.h"
-#include "pdb/pdb.h"
-#include "pdb/pdb_parse.h"
-#include "pdb/pdb_stringize.h"
 
 //- rjf: [c]
 #include "base/base_inc.c"
 #include "os/os_inc.c"
-#include "rdi_make/rdi_make_local.c"
-#include "coff/coff.c"
-#include "codeview/codeview.c"
-#include "codeview/codeview_stringize.c"
-#include "msf/msf.c"
-#include "msf/msf_parse.c"
-#include "pdb/pdb.c"
-#include "pdb/pdb_parse.c"
-#include "pdb/pdb_stringize.c"
 
 ////////////////////////////////
 //~ rjf: Entry Points
@@ -57,12 +39,12 @@ frame(void)
     {
       String8 string = push_str8f(scratch.arena, "%S (%S)\n", os_string_from_event_kind(ev->kind), os_g_key_display_string_table[ev->key]);
       printf("%.*s", str8_varg(string));
-      OutputDebugStringA((char *)string.str);
+      raddbg_log((char *)string.str);
       fflush(stdout);
     }
     if(ev->kind == OS_EventKind_Press && ev->key == OS_Key_X)
     {
-      *(int *)0 = 0;
+      *(volatile int *)0 = 0;
     }
   }
   for(OS_Event *ev = events.first; ev != 0; ev = ev->next)
@@ -80,7 +62,7 @@ frame(void)
 internal void
 entry_point(CmdLine *cmdline)
 {
-  OS_Handle window = os_window_open(v2f32(1280, 720), 0, str8_lit("Window"));
+  OS_Handle window = os_window_open(r2f32p(0, 0, 1280, 720), OS_WindowFlag_UseDefaultPosition, str8_lit("Window"));
   os_window_first_paint(window);
   for(;!update(););
 }