diff --git a/Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo b/Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo index 7ef0a267a..91f9f3407 100644 --- a/Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo +++ b/Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:/gonetz/GLideN64.git branch = master - commit = a367b3eef3d7b173fb60587c4371de93f0c7c59f - parent = 7713a9ec86e0de85cb2e526ca4954950cfd97593 + commit = 3b43a13a80dfc2eb6357673440b335e54eaa3896 + parent = 8d3f2d4d889b0a95d94ad447f5bf92d6ebf97c3b method = merge cmdver = 0.4.6 diff --git a/Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/TxFilter.cpp b/Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/TxFilter.cpp index 3aec25e3e..231b41864 100644 --- a/Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/TxFilter.cpp +++ b/Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/TxFilter.cpp @@ -149,7 +149,7 @@ TxFilter::TxFilter(int maxwidth, wchar_t fullTexPackPath[MAX_PATH]; wcscpy(fullTexPackPath, texPackPath); wcscat(fullTexPackPath, OSAL_DIR_SEPARATOR_STR); - wcscat(fullTexPackPath, ident); + wcscat(fullTexPackPath, _ident.c_str()); _txHiResLoader = new TxHiResNoCache(_maxwidth, _maxheight, _maxbpp, _options, texCachePath, texPackPath, fullTexPackPath, _ident.c_str(), callback); } else { _txHiResLoader = new TxHiResCache(_maxwidth, _maxheight, _maxbpp, _options, texCachePath, texPackPath, _ident.c_str(), callback); diff --git a/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarGFX_1_3.h b/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarGFX_1_3.h index f1cde0f17..12ca9febc 100644 --- a/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarGFX_1_3.h +++ b/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarGFX_1_3.h @@ -277,6 +277,14 @@ EXPORT void CALL ViWidthChanged (void); ******************************************************************/ EXPORT void CALL ReadScreen (void **dest, long *width, long *height); +/****************************************************************** + Function: DllCrtFree + Purpose: Frees the memory at the specified address with the dll's standard library + Input: none + Output: none + ******************************************************************/ +EXPORT void CALL DllCrtFree(void* addr); + #if defined(__cplusplus) } #endif diff --git a/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarPluginAPI.cpp b/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarPluginAPI.cpp index 89bd0284f..f79aa1a68 100644 --- a/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarPluginAPI.cpp +++ b/Source/3rdParty/mupen64plus-video-GLideN64/src/ZilmarPluginAPI.cpp @@ -55,4 +55,9 @@ EXPORT void CALL ReadScreen (void **dest, long *width, long *height) api().ReadScreen(dest, width, height); } +EXPORT void CALL DllCrtFree(void* addr) +{ + free(addr); +} + }