Merge remote-tracking branch 'origin/master' into version/4.2
This commit is contained in:
@@ -581,7 +581,11 @@ c16stombs(char dst[], const uint16_t src[], int len)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# define LIB_NAME_GS "gsdll32.dll"
|
# if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
|
||||||
|
# define LIB_NAME_GS "gsdll64.dll"
|
||||||
|
# else
|
||||||
|
# define LIB_NAME_GS "gsdll32.dll"
|
||||||
|
#endif
|
||||||
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
|
# define MOUSE_CAPTURE_KEYSEQ "F8+F12"
|
||||||
#else
|
#else
|
||||||
# define LIB_NAME_GS "libgs"
|
# define LIB_NAME_GS "libgs"
|
||||||
|
Reference in New Issue
Block a user