diff --git a/Assets/Plugins/x86/xlua.dll b/Assets/Plugins/x86/xlua.dll index 1cb991efd..775bd1160 100644 Binary files a/Assets/Plugins/x86/xlua.dll and b/Assets/Plugins/x86/xlua.dll differ diff --git a/Assets/Plugins/x86_64/xlua.dll b/Assets/Plugins/x86_64/xlua.dll index 7aaa596c0..8405b3ab6 100644 Binary files a/Assets/Plugins/x86_64/xlua.dll and b/Assets/Plugins/x86_64/xlua.dll differ diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 5d4fd8b44..7672c1009 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8) -if ( WIN32 AND NOT CYGWIN AND NOT ( CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" ) AND MSVC ) +if ( WIN32 AND NOT CYGWIN AND NOT ( CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" ) AND NOT ANDROID) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT" CACHE STRING "") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd" CACHE STRING "") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT" CACHE STRING "")