From 958cec83198a519fb9bf37f063323be3bda31b43 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 23 Mar 2013 09:40:14 +0100 Subject: [PATCH] * Update mingw toolchain. --- admin/win/Toolchain-mingw32-openSUSE.cmake | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/admin/win/Toolchain-mingw32-openSUSE.cmake b/admin/win/Toolchain-mingw32-openSUSE.cmake index 77f933ae4..1f58e2188 100644 --- a/admin/win/Toolchain-mingw32-openSUSE.cmake +++ b/admin/win/Toolchain-mingw32-openSUSE.cmake @@ -5,11 +5,9 @@ SET(CMAKE_SYSTEM_NAME Windows) # specify the cross compiler -SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc) -SET(CMAKE_C_FLAGS "-fno-keep-inline-dllexport") -SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++) -SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) -SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres) +SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc) +SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++) +SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}-windres) # where is the target environment containing libraries SET(CMAKE_FIND_ROOT_PATH /usr/${MINGW_PREFIX}/sys-root/mingw) @@ -18,6 +16,19 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -# configure qt variables -SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin) -SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/) +## configure qt variables +# generic +SET(QMAKESPEC win32-g++-cross) + +# dirs +SET(QT_LIBRARY_DIR /usr/${MINGW_PREFIX}/bin) +SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins) +SET(QT_MKSPECS_DIR ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs) +SET(QT_QT_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/include) + +# qt tools +SET(QT_QMAKE_EXECUTABLE ${MINGW_PREFIX}-qmake ) +SET(QT_MOC_EXECUTABLE ${MINGW_PREFIX}-moc) +SET(QT_RCC_EXECUTABLE ${MINGW_PREFIX}-rcc) +SET(QT_UIC_EXECUTABLE ${MINGW_PREFIX}-uic) +SET(QT_LRELEASE_EXECUTABLE ${MINGW_PREFIX}-lrelease)