notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added build arc to version output and relocated.

Browse source
This commit is contained in:
dolphin6k 2023-10-28 18:57:04 +09:00
parent 10a0a34b1b
commit 9eb8fcff43
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tuxpaint.c
View file

@ -30529,6 +30529,15 @@ int main(int argc, char *argv[])
freopen(stdout_win32, "w", stdout); /* redirect stdout to a file */ freopen(stdout_win32, "w", stdout); /* redirect stdout to a file */
freopen(stderr_win32, "w", stderr); /* redirect stderr to a file */ freopen(stderr_win32, "w", stderr); /* redirect stderr to a file */
#endif #endif
printf("Tux Paint Version " VER_VERSION "");
#ifdef WIN64
printf("- x86_64");
#else
printf("- i686");
#endif
printf(" (" VER_DATE ")\n");
printf("Running on ");
win32_print_version();
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -30580,12 +30589,6 @@ int main(int argc, char *argv[])
} }
#endif #endif
#ifdef WIN32
printf("Tux Paint Version " VER_VERSION " (" VER_DATE ")\n");
printf("Running on ");
win32_print_version();
#endif
claim_to_be_ready(); claim_to_be_ready();
mainloop(); mainloop();

14
src/win32_version.c
View file

@ -8,13 +8,13 @@ void win32_print_version(void);
void win32_print_version(void) void win32_print_version(void)
{ {
char *verStr; char *verStr;
unsigned int Version = 0; unsigned int Version = 0;
unsigned int Build = 0; unsigned int Build = 0;
Version = GetVersion(); Version = GetVersion();
if (Version < 0x80000000) if (Version < 0x80000000)
Build = (DWORD)(HIWORD(Version)); Build = (DWORD)(HIWORD(Version));
if (IsWindows10OrGreater()) { if (IsWindows10OrGreater()) {
if (Build < 22000){ if (Build < 22000){
verStr = strdup("Windows 10"); verStr = strdup("Windows 10");
@ -40,12 +40,12 @@ void win32_print_version(void)
} }
printf ("Microsoft %s", verStr); printf ("Microsoft %s", verStr);
if (IsWindowsServer()){ if (IsWindowsServer()){
printf(" Server"); printf(" Server");
} }
if (Version < 0x80000000){ if (Version < 0x80000000){
printf(" (Build %d)\n", Build); printf(" (Build %d)\n", Build);
} }
} }