Commit 3523cf92 authored by Olivier Langella's avatar Olivier Langella
Browse files

win64 almost built

parent 15375ac3
......@@ -28,9 +28,9 @@ if (NOT PAPPSOMSPP_DIR)
# FIND_PACKAGE( Pappsomspp REQUIRED )
endif (NOT PAPPSOMSPP_DIR)
#SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
INCLUDE_DIRECTORIES( ${PAPPSOMSPP_INCLUDE_DIR})
......@@ -271,7 +271,7 @@ IF (MINGW32)
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})
ADD_EXECUTABLE(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS} ${MASSCHROQ_LIB_SRCS} ${MASSCHROQ_LIB_MOC_SRCS} ${SAXLIB_SRCS} ${OBIWARP_SRCS} ${MASSCHROQ_RCC_SRCS_QT4})
TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${Qwt6_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)
......
......@@ -31,8 +31,8 @@ SET(QWT_PREFIX ${WINDAUBE_ENV_PATH}/qwt-6.1.2)
SET(QT_PREFIX ${WINDAUBE_ENV_PATH}/qt-4.8.7)
SET(QT5_PREFIX ${WINDAUBE_ENV_PATH}/qt-5.6.0)
SET (QWT_INCLUDE_DIR "${QWT_PREFIX}/include/qwt")
SET (QWT_LIBRARY "${QWT_PREFIX}/bin/qwt.dll")
SET (Qwt6_INCLUDE_DIR "${QWT_PREFIX}/include/qwt")
SET (Qwt6_Qt4_LIBRARY "${QWT_PREFIX}/bin/qwt.dll")
SET (ZLIB_INCLUDE_DIR "/home/langella/opt/zlib-1.2.8/include")
SET (QUAZIP_INCLUDE_DIR "/home/langella/opt/quazip-0.7.2")
......
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