[sword-svn] r2636 - trunk/cmake/toolchains

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2011-07-07 12:28:53 -0700 (Thu, 07 Jul 2011)
New Revision: 2636

Modified:
   trunk/cmake/toolchains/Toolchain-mingw32.cmake
Log:
Removed invalid merge text.

Modified: trunk/cmake/toolchains/Toolchain-mingw32.cmake
===================================================================
--- trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-07 19:28:44 UTC (rev 2635)
+++ trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-07 19:28:53 UTC (rev 2636)
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 SET(MINGW32_ROOT "/usr/i686-pc-mingw32/sys-root/mingw")
 
->>>>>>> fix-icu
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # specify the cross compiler
@@ -10,11 +7,7 @@
 SET(CMAKE_CXX_COMPILER /usr/bin/i686-pc-mingw32-g++)
 
 # where is the target environment
-<<<<<<< HEAD
-SET(CMAKE_FIND_ROOT_PATH /usr/i686-pc-mingw32/sys-root/mingw /usr/local/i686-pc-mingw32)
-=======
 SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-pc-mingw32)
->>>>>>> fix-icu
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -32,12 +25,9 @@
 
 # override boost library suffix which defaults to -mgw
 SET(Boost_COMPILER -gcc45)
-<<<<<<< HEAD
-=======
 
 # Since ICU is all strange and smart and stuff, let's do this
 SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
 
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
->>>>>>> fix-icu