diff --git a/ChangeLog b/ChangeLog index fda625fa6..728536bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-02-12 Tobias Doerffel + * cmake/modules/Win32Toolchain.cmake: + reflect recent changes to MinGW cross compiling environment + * plugins/sf2_player/sf2_player.cpp: update patch after loading settings (closes #2486372) diff --git a/cmake/modules/Win32Toolchain.cmake b/cmake/modules/Win32Toolchain.cmake index ea1a13e67..8318ed367 100644 --- a/cmake/modules/Win32Toolchain.cmake +++ b/cmake/modules/Win32Toolchain.cmake @@ -4,16 +4,16 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_VERSION 1) SET(CMAKE_SYSTEM_PROCESSOR i686) -SET(CMAKE_INSTALL_PREFIX /opt/mingw) +SET(CMAKE_INSTALL_PREFIX /opt/mingw32) -SET(CC_PREFIX /opt/mingw) +SET(CC_PREFIX /opt/mingw32) # specify the cross compiler -SET(CMAKE_C_COMPILER ${CC_PREFIX}/bin/i586-mingw32-gcc) -SET(CMAKE_CXX_COMPILER ${CC_PREFIX}/bin/i586-mingw32-g++) +SET(CMAKE_C_COMPILER ${CC_PREFIX}/bin/i586-pc-mingw32-gcc) +SET(CMAKE_CXX_COMPILER ${CC_PREFIX}/bin/i586-pc-mingw32-g++) # where is the target environment -SET(CMAKE_FIND_ROOT_PATH /opt/mingw) +SET(CMAKE_FIND_ROOT_PATH /opt/mingw32) SET(QT_BINARY_DIR ${CC_PREFIX}/bin) SET(QT_LIBRARY_DIR ${CC_PREFIX}/lib)