Merge pull request #4161 from OrN/wxwidgets-build-fix

Fix wxWidgets build for 32-bit arch
2016-08-31 11:29:04 +12:00 · 2016-08-31 11:29:04 +12:00 · def0b42fb7
parent 081cad709a f212d856b3
commit def0b42fb7
1 changed files with 4 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -848,6 +848,10 @@ if(NOT DISABLE_WX)
 	include(FindwxWidgets OPTIONAL)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)

+	if(_ARCH_32)
+		add_definitions(-DwxSIZE_T_IS_UINT)
+	endif()
+
 	if(wxWidgets_FOUND)
 		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"