From cafa2612656927902aea798d07ba3ae250aa8028 Mon Sep 17 00:00:00 2001 From: Thomas BERNARD Date: Fri, 14 Sep 2018 18:09:49 +0200 Subject: [PATCH] display libpng and recoil version in statistics --- src/Makefile.dep | 20 ++++++++++++-------- src/help.c | 24 +++++++++++++++++++++--- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/Makefile.dep b/src/Makefile.dep index 22f13e76..9e92c308 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -24,18 +24,20 @@ $(OBJDIR)/factory.o: factory.c brush.h struct.h const.h buttons.h loadsave.h \ $(OBJDIR)/fileformats.o: fileformats.c gfx2log.h errors.h global.h struct.h const.h \ loadsave.h gfx2surface.h misc.h io.h pages.h windows.h fileformats.h $(OBJDIR)/filesel.o: filesel.c const.h struct.h global.h misc.h errors.h gfx2log.h \ - io.h windows.h screen.h loadsave.h gfx2surface.h mountlist.h engine.h \ - readline.h input.h keycodes.h help.h unicode.h filesel.h + io.h windows.h screen.h loadsave.h gfx2surface.h mountlist.h engine.h \ + readline.h input.h keycodes.h help.h unicode.h filesel.h +$(OBJDIR)/generatedoc.o: generatedoc.c global.h struct.h const.h hotkeys.h \ + helpfile.h keyboard.h $(OBJDIR)/gfx2log.o: gfx2log.c gfx2log.h $(OBJDIR)/gfx2surface.o: gfx2surface.c gfx2surface.h struct.h const.h errors.h \ gfx2log.h $(OBJDIR)/graph.o: graph.c global.h struct.h const.h engine.h buttons.h loadsave.h \ - gfx2surface.h pages.h errors.h gfx2log.h screen.h graph.h misc.h \ - pxsimple.h pxtall.h pxwide.h pxdouble.h pxtriple.h pxwide2.h pxtall2.h \ - pxtall3.h pxquad.h windows.h input.h keycodes.h brush.h tiles.h -$(OBJDIR)/help.o: help.c const.h struct.h global.h misc.h engine.h helpfile.h \ - help.h screen.h text.h keyboard.h windows.h input.h keycodes.h hotkeys.h \ - errors.h gfx2log.h pages.h factory.h + gfx2surface.h pages.h errors.h gfx2log.h screen.h graph.h misc.h \ + pxsimple.h pxtall.h pxwide.h pxdouble.h pxtriple.h pxwide2.h pxtall2.h \ + pxtall3.h pxquad.h windows.h input.h keycodes.h brush.h tiles.h +$(OBJDIR)/help.o: help.c recoil.h const.h struct.h global.h misc.h engine.h \ + helpfile.h help.h screen.h text.h keyboard.h windows.h input.h \ + keycodes.h hotkeys.h errors.h gfx2log.h pages.h factory.h $(OBJDIR)/hotkeys.o: hotkeys.c struct.h const.h global.h hotkeys.h keycodes.h $(OBJDIR)/init.o: init.c buttons.h struct.h const.h loadsave.h gfx2surface.h \ errors.h gfx2log.h global.h graph.h init.h io.h factory.h help.h \ @@ -126,6 +128,8 @@ $(OBJDIR)/transform.o: transform.c global.h struct.h const.h transform.h engine. loadsave.h gfx2surface.h pages.h tiles.h $(OBJDIR)/unicode.o: unicode.c unicode.h struct.h const.h $(OBJDIR)/version.o: version.c +$(OBJDIR)/win32screen.o: win32screen.c screen.h struct.h const.h global.h errors.h \ + gfx2log.h windows.h input.h keycodes.h keyboard.h $(OBJDIR)/windows.o: windows.c windows.h struct.h const.h engine.h errors.h \ gfx2log.h global.h graph.h input.h keycodes.h misc.h op_c.h colorred.h \ readline.h screen.h palette.h unicode.h keyboard.h diff --git a/src/help.c b/src/help.c index 9fba15d6..ccbe55c6 100644 --- a/src/help.c +++ b/src/help.c @@ -45,6 +45,13 @@ #include #endif +#ifndef __no_pnglib__ +#include +#endif +#ifndef NORECOIL +#include "recoil.h" +#endif + #include "const.h" #include "struct.h" #include "global.h" @@ -705,14 +712,26 @@ void Button_Stats(int btn) y=19; // row for first line Print_in_window(10,y,"Program version:",STATS_TITLE_COLOR,MC_Black); - sprintf(buffer,"%s.%s",Program_version, SVN_revision); + snprintf(buffer,20,"%s.%s",Program_version, SVN_revision); Print_in_window(146,y,buffer,STATS_DATA_COLOR,MC_Black); - y+=16; + y+=8; Print_in_window(10,y,"Build options:",STATS_TITLE_COLOR,MC_Black); Print_in_window(146,y,TrueType_is_supported()?"TTF fonts":"no TTF fonts",STATS_DATA_COLOR,MC_Black); y+=8; Print_in_window(10,y,"Lua version:",STATS_TITLE_COLOR,MC_Black); Print_in_window_limited(146,y,Lua_version(),10,STATS_DATA_COLOR,MC_Black); + y+=8; + Print_in_window(10,y,"libpng version:",STATS_TITLE_COLOR,MC_Black); +#ifdef __no_pnglib__ + Print_in_window(146,y,"not linked",STATS_DATA_COLOR,MC_Black); +#else + Print_in_window(146,y,png_libpng_ver,STATS_DATA_COLOR,MC_Black); +#endif +#ifndef NORECOIL + y+=8; + Print_in_window(10,y,"recoil version:",STATS_TITLE_COLOR,MC_Black); + Print_in_window(146,y,RECOIL_VERSION " (" RECOIL_YEARS ")",STATS_DATA_COLOR,MC_Black); +#endif y+=16; Print_in_window(10,y,"Free memory: ",STATS_TITLE_COLOR,MC_Black); y+=8; @@ -892,4 +911,3 @@ void Button_Stats(int btn) Unselect_button(btn); Display_cursor(); } -