SF.net SVN: alleg:[15134] allegro/branches/5.1/cmake/Toolchain-mingw.cmake

[<el...@us...>]

Revision: 15134
          http://alleg.svn.sourceforge.net/alleg/?rev=15134&view=rev
Author:   elias
Date:     2011-12-18 18:10:25 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Detect the new mingw cross-compiler in Ubuntu.

Modified Paths:
--------------
    allegro/branches/5.1/cmake/Toolchain-mingw.cmake

Modified: allegro/branches/5.1/cmake/Toolchain-mingw.cmake
===================================================================
--- allegro/branches/5.1/cmake/Toolchain-mingw.cmake	2011-12-18 06:30:52 UTC (rev 15133)
+++ allegro/branches/5.1/cmake/Toolchain-mingw.cmake	2011-12-18 18:10:25 UTC (rev 15134)
@@ -29,6 +29,11 @@
     set(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
     set(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
     set(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
+elseif(EXISTS /usr/i686-w64-mingw32)
+    # First look in standard location as used by Debian/Ubuntu/etc.
+    set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+    set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+    set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 elseif(EXISTS /opt/mingw)
     # Otherwise you can get a MinGW environment using the script at
     # <http://mingw-cross-env.nongnu.org>.  It downloads and builds MinGW and

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.