From b9f93b8fa5684b978f83ce9b8e05f0e2edfa627b Mon Sep 17 00:00:00 2001 From: "(Tim) Efthimis Kritikos" Date: Fri, 1 Mar 2024 21:34:23 +0000 Subject: [PATCH] Project: Fixed compiling with clang --- gui.h | 3 ++- gui_display.c | 2 +- gui_display.h | 5 +++++ main.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gui.h b/gui.h index 7f61c56..2631524 100644 --- a/gui.h +++ b/gui.h @@ -1,6 +1,7 @@ #include "simdata.h" +#include "gui_display.h" -int start_gui(); +int start_gui(enum FB_DRIVER_t); int gui_continue_request(struct simdata_t*); int end_gui(); int gui_error(char *); diff --git a/gui_display.c b/gui_display.c index 176f3e2..c4c4ab3 100644 --- a/gui_display.c +++ b/gui_display.c @@ -146,11 +146,11 @@ int init_aalib(WINDOW *win,int fullscreen){ return 1; return 0; } -#endif int clean_aalib(){ aa_close(aactx); return 0; } +#endif diff --git a/gui_display.h b/gui_display.h index a02aee5..874235f 100644 --- a/gui_display.h +++ b/gui_display.h @@ -1,3 +1,5 @@ +#ifndef GUI_DISPLAY + #include int update_general_terminal_output(WINDOW *win, struct simdata_t *simdata); int update_display_terminal_output(WINDOW *win, struct simdata_t *simdata); @@ -6,3 +8,6 @@ enum FB_DRIVER_t{ FB_AALIB, FB_BRAILLE }; + +#endif +#define GUI_DISPLAY diff --git a/main.c b/main.c index 2ba9c0d..0023af0 100644 --- a/main.c +++ b/main.c @@ -96,7 +96,7 @@ int main(int argc, char* argd[] ){ #ifndef USE_AALIB if(fb_driver==FB_AALIB){ printf("ERROR:Project wasn't compiled with aalib support.\n"); - help(); + help(argd[0]); return 1; } #endif