Merge

mariadb-corporation · Feb 15, 2015 · 6833467 · 6833467
2 parents 011e68a + de7fad9
commit 6833467
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/README b/README
@@ -1,6 +1,6 @@
-MariaDB Connector/ODBC 1.0
+MariaDB Connector/ODBC 2.0 alpha
 
-This is a GA release of the MariaDB Connector/ODBC for Windows.
+This is a GA release of the MariaDB Connector/ODBC.
 MariaDB Connector/ODBC is released under version 2.1 of the
 GNU Lesser Public License.
 

diff --git a/cmake/linux_x86_toolchain.cmake b/cmake/linux_x86_toolchain.cmake
@@ -0,0 +1,11 @@
+# toolchain file for building a 32bit version on a 64bit host
+
+# Usage:
+# cmake -DCMAKE_TOOLCHAIN_FILE=linux_86.toolchain.cmake 
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR "i686")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")