Commit 7f7d3336 authored by Olivier Langella's avatar Olivier Langella
Browse files

mingw64 toolchain OK

parent 2a4827f5
......@@ -257,7 +257,7 @@ ENDIF (NOGUI)
IF (MINGW32)
ADD_EXECUTABLE(masschroq main.cpp ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS}
${SAXLIB_SRCS} ${OBIWARP_SRCS} ${MASSCHROQ_RCC_SRCS_QT4})
TARGET_LINK_LIBRARIES(masschroq ${QT_LIBRARIES} )
TARGET_LINK_LIBRARIES(masschroq ${QT_LIBRARIES} ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
SET_TARGET_PROPERTIES(masschroq PROPERTIES LINK_FLAGS "-Wl,--subsystem,console ${ADD_MINGW_EXE_LINKER_FLAGS}")
IF (NOGUI)
......@@ -266,13 +266,13 @@ IF (MINGW32)
ADD_EXECUTABLE(masschroq_gui gui/launcherGui.cpp ${GUI_SRCS} ${GUI_MOC_SRCS} ${MASSCHROQ_LIB_SRCS}
${MASSCHROQ_LIB_MOC_SRCS} ${SAXLIB_SRCS} ${OBIWARP_SRCS} ${GUI_UI_HDRS} ${MASSCHROQ_RCC_SRCS_QT4})
TARGET_LINK_LIBRARIES(masschroq_gui ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(masschroq_gui ${QT_LIBRARIES} ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
SET_TARGET_PROPERTIES(masschroq_gui PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows ${ADD_MINGW_EXE_LINKER_FLAGS}")
IF (NOQWT)
ELSE (NOQWT)
ADD_EXECUTABLE(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS} ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS} ${SAXLIB_SRCS} ${OBIWARP_SRCS})
TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY} ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
SET_TARGET_PROPERTIES(masschroq_studio PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import -Wl,--subsystem,windows ${ADD_MINGW_EXE_LINKER_FLAGS}")
ENDIF (NOQWT)
......@@ -295,7 +295,7 @@ ELSE (MINGW32)
#ADD_EXECUTABLE(new_parseur parseur.cpp)
#TARGET_LINK_LIBRARIES(new_parseur ${MASSCHROQ_LIB_NAME} ${QT_LIBRARIES})
INSTALL(TARGETS ${MASSCHROQ_LIB_NAME} DESTINATION lib)
INSTALL(TARGETS ${MASSCHROQ_LIB_NAME} LIBRARY DESTINATION lib)
IF (NOGUI)
ELSE (NOGUI)
......
......@@ -8,7 +8,7 @@ SET (NOGUI 0)
SET (NOQWT 1)
# scp index.html tryphon@bioinformatics.org:~/public_html/populations
#
#SET (MINGW32 1)
SET (MINGW32 1)
#SET (WIN32 1)
# this one is important
......@@ -33,6 +33,7 @@ SET(QT5_PREFIX ${WINDAUBE_ENV_PATH}/qt-5.6.0)
SET (ZLIB_INCLUDE_DIR "/home/langella/opt/zlib-1.2.8/include")
SET (QUAZIP_INCLUDE_DIR "/home/langella/opt/quazip-0.7.2")
SET (MASSCHROQ_LIB_NAME "libmasschroq.dll")
SET (ODSSTREAM_DIR "/home/langella/developpement/git/libodsstream")
SET (ODSSTREAM_INCLUDE_DIR "${ODSSTREAM_DIR}/src")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment