Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting https://git.osmesh.ru/MOS/OpenBoard/commit/1613ca0a196daae4be883f26c326dfe29f1dd704?style=split&whitespace=ignore-all You should set ROOT_URL correctly, otherwise the web may not work correctly.

CffAdaptor builds separately for debug and for release.

Sankore is adapted to use cffadaptor builds separately.
preferencesAboutTextFull
Aleksei Kanash 13 years ago
parent e870c3104b
commit 1613ca0a19
  1. 7
      Sankore_3.1.pro
  2. 37
      plugins/cffadaptor/UBCFFAdaptor.pro

@ -109,8 +109,9 @@ MOC_DIR = $$BUILD_DIR/moc
RCC_DIR = $$BUILD_DIR/rcc RCC_DIR = $$BUILD_DIR/rcc
UI_DIR = $$BUILD_DIR/ui UI_DIR = $$BUILD_DIR/ui
LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
win32 { win32 {
LIBS += "-Lplugins/cffadaptor/lib/win32" "-lCFF_Adaptor"
RC_FILE = resources/win/sankore.rc RC_FILE = resources/win/sankore.rc
CONFIG += qaxcontainer CONFIG += qaxcontainer
exists(console):CONFIG += console exists(console):CONFIG += console
@ -131,7 +132,6 @@ win32 {
} }
macx { macx {
LIBS += "-Lplugins/cffadaptor/lib/macx" "-lCFF_Adaptor"
LIBS += -framework Foundation LIBS += -framework Foundation
LIBS += -lcrypto LIBS += -lcrypto
LIBS += -framework AppKit LIBS += -framework AppKit
@ -329,7 +329,6 @@ macx {
} }
linux-g++ { linux-g++ {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp
@ -345,7 +344,6 @@ linux-g++ {
} }
linux-g++-32 { linux-g++-32 {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp
@ -361,7 +359,6 @@ linux-g++-32 {
} }
linux-g++-64 { linux-g++-64 {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp

@ -4,6 +4,9 @@
# #
#------------------------------------------------- #-------------------------------------------------
TARGET = CFF_Adaptor
TEMPLATE = lib
win32: SUB_DIR = win32 win32: SUB_DIR = win32
macx: SUB_DIR = macx macx: SUB_DIR = macx
linux-g++: SUB_DIR = linux linux-g++: SUB_DIR = linux
@ -13,11 +16,21 @@ linux-g++-64: SUB_DIR = linux
THIRD_PARTY_PATH = ../../../Sankore-ThirdParty THIRD_PARTY_PATH = ../../../Sankore-ThirdParty
QUAZIP_DIR = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3" QUAZIP_DIR = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3"
INCLUDEPATH += src BUILD_DIR = $$PWD/build/$$SUB_DIR
CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
CONFIG(release, debug|release) {
BUILD_DIR = $$BUILD_DIR/release
CONFIG += warn_off
}
DEPENDPATH += $$THIRD_PARTY_PATH/quazip/ win32{
INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/ CONFIG += dll
include($$THIRD_PARTY_PATH/quazip/quazip.pri) }
OBJECTS_DIR = $$BUILD_DIR/objects
MOC_DIR = $$BUILD_DIR/moc
DESTDIR = $$BUILD_DIR/lib
RCC_DIR = $$BUILD_DIR/rcc
LIBS += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip" LIBS += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip"
@ -25,15 +38,17 @@ QT += xml xmlpatterns core
QT += gui QT += gui
QT += svg QT += svg
TARGET = CFF_Adaptor
TEMPLATE = lib
win32{
CONFIG += dll
}
DEFINES += UBCFFADAPTOR_LIBRARY DEFINES += UBCFFADAPTOR_LIBRARY
DEFINES += NO_THIRD_PARTY_WARNINGS DEFINES += NO_THIRD_PARTY_WARNINGS
INCLUDEPATH += src
DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
include($$THIRD_PARTY_PATH/quazip/quazip.pri)
SOURCES += \ SOURCES += \
src/UBCFFAdaptor.cpp src/UBCFFAdaptor.cpp
@ -43,9 +58,5 @@ HEADERS +=\
src/UBCFFAdaptor_global.h \ src/UBCFFAdaptor_global.h \
src/UBCFFConstants.h src/UBCFFConstants.h
OBJECTS_DIR = $$PWD/objects
MOC_DIR = $$PWD/moc
DESTDIR = $$PWD/lib/$$SUB_DIR
RESOURCES += \ RESOURCES += \
resources/resources.qrc resources/resources.qrc

Loading…
Cancel
Save