diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
index a39580cd..a9063ae1 100644
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@@ -10,13 +10,13 @@ FIND_LIBRARY(LUA_LIBRARY NAMES liblua51.a liblua5.1.a liblua-5.1.a liblua.a lua5
 IF(LUA_LIBRARY)
   IF(UNIX AND NOT APPLE)
     FIND_LIBRARY(LUA_MATH_LIBRARY m)
-    SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+    SET(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
   ELSE(UNIX AND NOT APPLE)
     SET(LUA_LIBRARIES "${LUA_LIBRARY}")
   ENDIF(UNIX AND NOT APPLE)
 ENDIF(LUA_LIBRARY)
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua DEFAULT_MSG  LUA_LIBRARIES LUA_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR)
 MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
 
diff --git a/cmake/cmake-mingw32-toolchain b/cmake/i486-mingw32_toolchain.cmake
similarity index 100%
rename from cmake/cmake-mingw32-toolchain
rename to cmake/i486-mingw32_toolchain.cmake
diff --git a/cmake/i586-mingw32msvc_toolchain.cmake b/cmake/i586-mingw32msvc_toolchain.cmake
new file mode 100644
index 00000000..7c7557a2
--- /dev/null
+++ b/cmake/i586-mingw32msvc_toolchain.cmake
@@ -0,0 +1,8 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
+SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
+SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
+SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)