3rdParty: update mupen64plus-video-GLideN64

This commit is contained in:
Rosalie Wanders committed 2023-07-19 16:17:56 +02:00
1 parent 72574046ed
commit fd2f0ea18e
5 files changed
+33 -8

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:/Rosalie241/GLideN64.git
branch = RMG
commit = 2f1b358028e700fcae2502a53f4f5e6822ce0367
parent = 028316ababb4f76db45f62ada48ba0e274e2ea37
commit = fdb093792607a57dd9adc60c3d9ee4c1990852d3
parent = 26414e59cc1359535c4bf26a3ac3f4dec5078446
method = merge
cmdver = 0.4.6
@@ -36,11 +36,19 @@ bool getCursorPos(long & _x, long & _y)
static HWND hWnd = NULL;
if (hWnd == NULL) {
wchar_t caption[64];
#ifdef PLUGIN_REVISION_W
# ifdef _DEBUG
swprintf(caption, 64, L"mupen64plus: %ls debug. Revision %ls", pluginNameW, PLUGIN_REVISION_W);
# else // _DEBUG
swprintf(caption, 64, L"%s. Revision %s", pluginName, PLUGIN_REVISION);
# endif // _DEBUG
#else // PLUGIN_REVISION_W
# ifdef _DEBUG
swprintf(caption, 64, L"mupen64plus: %ls debug.", pluginNameW);
# else // _DEBUG
swprintf(caption, 64, L"%s", pluginName);
# endif // _DEBUG
#endif // PLUGIN_REVISION_W
hWnd = FindWindowExW(NULL, NULL, NULL, caption);
}
ScreenToClient(hWnd, &pt);
@@ -1,5 +1,9 @@
#include <Revision.h>
char pluginName[] = "GLideN64";
#ifdef PLUGIN_REVISION
char pluginNameWithRevision[] = "GLideN64 rev." PLUGIN_REVISION;
#else // PLUGIN_REVISION
char pluginNameWithRevision[] = "GLideN64";
#endif // PLUGIN_REVISION
wchar_t pluginNameW[] = L"GLideN64";
void (*CheckInterrupts)( void );
@@ -116,11 +116,19 @@ bool DisplayWindowMupen64plus::_start()
}
char caption[128];
#ifdef PLUGIN_REVISION
# ifdef _DEBUG
sprintf(caption, "%s debug. Revision %s", pluginName, PLUGIN_REVISION);
# else // _DEBUG
sprintf(caption, "%s. Revision %s", pluginName, PLUGIN_REVISION);
# endif // _DEBUG
#else // PLUGIN_REVISION
# ifdef _DEBUG
sprintf(caption, "%s debug", pluginName);
# else // _DEBUG
sprintf(caption, "%s", pluginName);
# endif // _DEBUG
#endif // PLUGIN_REVISION
CoreVideo_SetCaption(caption);
return true;
@@ -8,22 +8,27 @@ header="${OUTPUT:-./Revision.h}"
if [ "${1:-}" != --nogit ]
then
rev="\"$(git rev-parse --short HEAD)\"" || rev='""'
rev="\"$(git rev-parse --short HEAD)\"" || rev='""'
else
rev='""'
rev='""'
fi
lastrev=''
if [ -e "$header" ]
then
lastrev="$(head -n 1 "$header" 2> /dev/null | cut -d ' ' -f3)"
lastrev="$(head -n 1 "$header" 2> /dev/null | cut -d ' ' -f3)"
fi
printf '%s\n' "current revision $rev" "last build revision $lastrev"
if [ "$lastrev" != "$rev" ]
then
[ "$header" = "${header##*/}" ] || mkdir -p -- "${header%/*}"
printf '%s\n' "#define PLUGIN_REVISION $rev" \
"#define PLUGIN_REVISION_W L$rev" > "$header"
[ "$header" = "${header##*/}" ] || mkdir -p -- "${header%/*}"
if [ "x$rev" != "x\"\"" ]
then
printf '%s\n' "#define PLUGIN_REVISION $rev" \
"#define PLUGIN_REVISION_W L$rev" > "$header"
else
printf '\n' > "$header"
fi
fi