Build fix:
Don't use isascii() - just do it ourselves Bump required wxw version (for shared libs) There still seems to be linking issues on some linux distros, I can't reproduce it though...
This commit is contained in:
parent
dd5df17688
commit
c0992cc73e
|
@ -457,10 +457,8 @@ endif()
|
|||
|
||||
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
|
||||
if(NOT DISABLE_WX)
|
||||
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
include(FindwxWidgets OPTIONAL)
|
||||
FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
|
||||
endif()
|
||||
include(FindwxWidgets OPTIONAL)
|
||||
FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
|
||||
|
||||
if(wxWidgets_FOUND)
|
||||
EXECUTE_PROCESS(
|
||||
|
@ -471,8 +469,8 @@ if(NOT DISABLE_WX)
|
|||
ERROR_QUIET
|
||||
)
|
||||
message("Found wxWidgets version ${wxWidgets_VERSION}")
|
||||
if(${wxWidgets_VERSION} VERSION_LESS "2.8.9")
|
||||
message("At least 2.8.9 is required; ignoring found version")
|
||||
if(${wxWidgets_VERSION} VERSION_LESS "2.9.4")
|
||||
message("At least 2.9.4 is required; ignoring found version")
|
||||
unset(wxWidgets_FOUND)
|
||||
endif()
|
||||
endif(wxWidgets_FOUND)
|
||||
|
|
|
@ -73,8 +73,6 @@
|
|||
#include "State.h"
|
||||
#include "Movie.h"
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
// TODO: ugly, remove
|
||||
bool g_aspect_wide;
|
||||
|
||||
|
@ -132,8 +130,9 @@ void DisplayMessage(const char *message, int time_in_ms)
|
|||
SConfig::GetInstance().m_LocalCoreStartupParameter;
|
||||
|
||||
// Actually displaying non-ASCII could cause things to go pear-shaped
|
||||
if (!isascii(message))
|
||||
return;
|
||||
for (const char *c = message; *c != '\0'; ++c)
|
||||
if (*c < ' ')
|
||||
return;
|
||||
|
||||
g_video_backend->Video_AddMessage(message, time_in_ms);
|
||||
|
||||
|
|
Loading…
Reference in New Issue