Added git url/revision info to the GTK/SDL GUI about window. Added git url/revision information to command line help print out for both GTK and QT versions.

This commit is contained in:
Matthew Budd 2020-08-07 16:59:27 -04:00
parent bb4adb36b4
commit 1b0888e146
4 changed files with 19 additions and 1 deletions

View File

@ -15,6 +15,7 @@
#include "Qt/nes_shm.h"
#include "Qt/unix-netplay.h"
#include "Qt/ConsoleWindow.h"
#include "Qt/fceux_git_info.h"
#include "common/cheat.h"
#include "../../fceu.h"
@ -410,6 +411,8 @@ static void ShowUsage(const char *prog)
SDL_GetVersion(&v);
printf("Linked with SDL version %d.%d.%d\n", v.major, v.minor, v.patch);
printf("Compiled with QT version %d.%d.%d\n", QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH );
printf("git URL: %s\n", fceu_get_git_url() );
printf("git Rev: %s\n", fceu_get_git_rev() );
}

View File

@ -0,0 +1,4 @@
// fceux_git_info.h
const char *fceu_get_git_url(void);
const char *fceu_get_git_rev(void);

View File

@ -19,6 +19,7 @@
#include "memview.h"
#include "ramwatch.h"
#include "debugger.h"
#include "fceux_git_info.h"
#ifdef _S9XLUA_H
#include "../../fceulua.h"
@ -1503,6 +1504,7 @@ static gboolean destroyMainWindowCB(
const char *Authors[] = {
"Linux/SDL Developers:",
" mjbudd77",
" Lukas Sabota //punkrockguy318", " Soules", " Bryan Cain", " radsaq",
" Shinydoofy",
"FceuX 2.0 Developers:",
@ -1523,11 +1525,16 @@ const char *Authors[] = {
void openAbout (void)
{
char versionString[512];
GdkPixbuf *logo = gdk_pixbuf_new_from_xpm_data (icon_xpm);
sprintf( versionString, "%s\ngit URL: %s\ngit Rev: %s",
FCEU_VERSION_STRING, fceu_get_git_url(), fceu_get_git_rev() );
gtk_show_about_dialog (GTK_WINDOW (MainWindow),
"program-name", "fceuX",
"version", FCEU_VERSION_STRING,
"version", versionString,
"copyright", "© 2016 FceuX development team",
"license", "GPL-2; See COPYING",
//"license-type", GTK_LICENSE_GPL_2_0,

View File

@ -35,6 +35,8 @@
#include "gui.h"
#endif
#include "fceux_git_info.h"
#include <unistd.h>
#include <csignal>
#include <cstring>
@ -182,6 +184,8 @@ static void ShowUsage(char *prog)
printf("Compiled with GTK version %d.%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION );
//printf("Linked with GTK version %d.%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION );
#endif
printf("git URL: %s\n", fceu_get_git_url() );
printf("git Rev: %s\n", fceu_get_git_rev() );
}