The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 19:42:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build fix:

Browse Source 
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:
Shawn Hoffman 2012-03-19 23:16:01 -07:00
parent dd5df17688
commit c0992cc73e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -457,10 +457,8 @@ endif()
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
if(NOT DISABLE_WX) if(NOT DISABLE_WX)
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
include(FindwxWidgets OPTIONAL) include(FindwxWidgets OPTIONAL)
FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
endif()
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
EXECUTE_PROCESS( EXECUTE_PROCESS(
@ -471,8 +469,8 @@ if(NOT DISABLE_WX)
ERROR_QUIET ERROR_QUIET
) )
message("Found wxWidgets version ${wxWidgets_VERSION}") message("Found wxWidgets version ${wxWidgets_VERSION}")
if(${wxWidgets_VERSION} VERSION_LESS "2.8.9") if(${wxWidgets_VERSION} VERSION_LESS "2.9.4")
message("At least 2.8.9 is required; ignoring found version") message("At least 2.9.4 is required; ignoring found version")
unset(wxWidgets_FOUND) unset(wxWidgets_FOUND)
endif() endif()
endif(wxWidgets_FOUND) endif(wxWidgets_FOUND)

5
Source/Core/Core/Src/Core.cpp
View File

@ -73,8 +73,6 @@
#include "State.h" #include "State.h"
#include "Movie.h" #include "Movie.h"
#include <ctype.h>
// TODO: ugly, remove // TODO: ugly, remove
bool g_aspect_wide; bool g_aspect_wide;
@ -132,7 +130,8 @@ void DisplayMessage(const char *message, int time_in_ms)
SConfig::GetInstance().m_LocalCoreStartupParameter; SConfig::GetInstance().m_LocalCoreStartupParameter;
// Actually displaying non-ASCII could cause things to go pear-shaped // Actually displaying non-ASCII could cause things to go pear-shaped
if (!isascii(message)) for (const char *c = message; *c != '\0'; ++c)
if (*c < ' ')
return; return;
g_video_backend->Video_AddMessage(message, time_in_ms); g_video_backend->Video_AddMessage(message, time_in_ms);