From b4206ebe1194ed44bebf5bced04dee8fceb85426 Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Mon, 31 May 2021 10:55:02 -0600 Subject: [PATCH] update input qt --- mupen64plus-input-qt/mupen64plus-input-qt.pro | 1 - mupen64plus-input-qt/osal/osal_dynamiclib_win32.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mupen64plus-input-qt/mupen64plus-input-qt.pro b/mupen64plus-input-qt/mupen64plus-input-qt.pro index fdc55aa..4ebd337 100644 --- a/mupen64plus-input-qt/mupen64plus-input-qt.pro +++ b/mupen64plus-input-qt/mupen64plus-input-qt.pro @@ -47,7 +47,6 @@ SOURCES += osal/osal_dynamiclib_win32.c } INCLUDEPATH += ../mupen64plus-win32-deps/SDL2-2.0.6/include } else { - DEFINES -= UNICODE LIBS += -Wl,-Bdynamic -lSDL2 INCLUDEPATH += /mingw64/include/SDL2 /mingw32/include/SDL2 } diff --git a/mupen64plus-input-qt/osal/osal_dynamiclib_win32.c b/mupen64plus-input-qt/osal/osal_dynamiclib_win32.c index 79dae43..9818d33 100644 --- a/mupen64plus-input-qt/osal/osal_dynamiclib_win32.c +++ b/mupen64plus-input-qt/osal/osal_dynamiclib_win32.c @@ -31,7 +31,9 @@ m64p_error osal_dynlib_open(m64p_dynlib_handle *pLibHandle, const char *pccLibra if (pLibHandle == NULL || pccLibraryPath == NULL) return M64ERR_INPUT_ASSERT; - *pLibHandle = LoadLibrary(pccLibraryPath); + wchar_t wstr[256]; + mbstowcs(wstr, pccLibraryPath, 256); + *pLibHandle = LoadLibrary(wstr); if (*pLibHandle == NULL) {