some cosmetics

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent d82fdd7d0a
commit a2654f8a8f
  1. 78
      Sankore_3.1.pro
  2. 33
      Subdirs.pro
  3. 6
      plugins/plugins.pri

@ -7,19 +7,6 @@ CONFIG -= flat
CONFIG += debug_and_release \ CONFIG += debug_and_release \
no_include_pwd no_include_pwd
linux-g++-64 {
CONFIG += link_prl
}
linux-g++-32 {
CONFIG += link_prl
}
linux-g++ {
CONFIG += link_prl
}
VERSION_MAJ = 2 VERSION_MAJ = 2
VERSION_MIN = 00 VERSION_MIN = 00
@ -46,7 +33,6 @@ QT += script
QT += xmlpatterns QT += xmlpatterns
INCLUDEPATH += src INCLUDEPATH += src
INCLUDEPATH += plugins/cffadaptor/src
include($$THIRD_PARTY_PATH/libs.pri) include($$THIRD_PARTY_PATH/libs.pri)
include(src/adaptors/adaptors.pri) include(src/adaptors/adaptors.pri)
@ -70,6 +56,13 @@ include(src/customWidgets/customWidgets.pri)
DEPENDPATH += src/pdf-merger DEPENDPATH += src/pdf-merger
INCLUDEPATH += src/pdf-merger INCLUDEPATH += src/pdf-merger
include(src/pdf-merger/pdfMerger.pri) include(src/pdf-merger/pdfMerger.pri)
#plugins
include(plugins/plugins.pri)
INCLUDEPATH += plugins/cffadaptor/src
#ThirdParty
DEPENDPATH += $$THIRD_PARTY_PATH/quazip/ DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/ INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
include($$THIRD_PARTY_PATH/quazip/quazip.pri) include($$THIRD_PARTY_PATH/quazip/quazip.pri)
@ -103,9 +96,7 @@ BUILD_DIR = build
macx:BUILD_DIR = $$BUILD_DIR/macx macx:BUILD_DIR = $$BUILD_DIR/macx
win32:BUILD_DIR = $$BUILD_DIR/win32 win32:BUILD_DIR = $$BUILD_DIR/win32
linux-g++:BUILD_DIR = $$BUILD_DIR/linux linux-g++*:BUILD_DIR = $$BUILD_DIR/linux
linux-g++-32:BUILD_DIR = $$BUILD_DIR/linux
linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux
CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
@ -119,16 +110,12 @@ 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 {
RC_FILE = resources/win/sankore.rc RC_FILE = resources/win/sankore.rc
CONFIG += qaxcontainer CONFIG += qaxcontainer
exists(console):CONFIG += console exists(console):CONFIG += console
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += /MP
/MP QMAKE_CXXFLAGS_RELEASE += /Od /Zi
QMAKE_CXXFLAGS_RELEASE += /Od \
/Zi
QMAKE_LFLAGS_RELEASE += /DEBUG QMAKE_LFLAGS_RELEASE += /DEBUG
UB_LIBRARY.path = $$DESTDIR UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n UB_I18N.path = $$DESTDIR/i18n
@ -360,39 +347,9 @@ macx {
system(printf "%02x%02x%02x%02x" `printf $$VERSION_RC | cut -d ',' -f 1` `printf $$VERSION_RC | cut -d ',' -f 2` `printf $$VERSION_RC | cut -d ',' -f 3` `printf $$VERSION_RC | cut -d ',' -f 4` | xxd -r -p > "$$VERSION_RC_PATH") system(printf "%02x%02x%02x%02x" `printf $$VERSION_RC | cut -d ',' -f 1` `printf $$VERSION_RC | cut -d ',' -f 2` `printf $$VERSION_RC | cut -d ',' -f 3` `printf $$VERSION_RC | cut -d ',' -f 4` | xxd -r -p > "$$VERSION_RC_PATH")
} }
linux-g++ { linux-g++* {
LIBS += -lcrypto message(LINUX)
LIBS += -lX11 CONFIG += link_prl
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR
UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
system(mkdir -p $$BUILD_DIR)
system(echo "$$VERSION" > $$BUILD_DIR/version)
system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
}
linux-g++-32 {
LIBS += -lcrypto
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR
UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
system(mkdir -p $$BUILD_DIR)
system(echo "$$VERSION" > $$BUILD_DIR/version)
system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
}
linux-g++-64 {
LIBS += -lcrypto LIBS += -lcrypto
LIBS += -lX11 LIBS += -lX11
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
@ -442,12 +399,3 @@ INSTALLS = UB_ETC \
UB_LIBRARY \ UB_LIBRARY \
UB_THIRDPARTY_INTERACTIVE UB_THIRDPARTY_INTERACTIVE
HEADERS += \
plugins/cffadaptor/src/UBGlobals.h \
plugins/cffadaptor/src/UBCFFConstants.h \
plugins/cffadaptor/src/UBCFFAdaptor.h \
plugins/cffadaptor/src/UBCFFAdaptor_global.h
SOURCES += \
plugins/cffadaptor/src/UBCFFAdaptor.cpp

@ -1,33 +0,0 @@
TEMPLATE = subdirs
CONFIG += ordered
CONFIG += debug_and_release
win32: SUB_DIR = win32
macx: SUB_DIR = macx
linux-g++: SUB_DIR = linux
linux-g++-32: SUB_DIR = linux
linux-g++-64: SUB_DIR = linux
BUILD_DIR = build/$$SUB_DIR
CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
CONFIG(release, debug|release) {
BUILD_DIR = $$BUILD_DIR/release
CONFIG += warn_off
}
SANKORE_DIR = $$PWD
SANKORE_PRO = $$SANKORE_DIR/Sankore_3.1.pro
THIRD_PARTY_DIR = $$PWD/Sankore-ThirdParty
SANKORE_PLUGINS_DIR = $$SANKORE_DIR/plugins
PLUGIN_CFF_ADAPTOR_DIR = $$SANKORE_PLUGINS_DIR/cffadaptor
PLUGIN_CFF_ADAPTOR_PRO = $$PLUGIN_CFF_ADAPTOR_DIR/UBCFFAdaptor.pro
#visoal studio sets first project as executable
contains(TEMPLATE, vcsubdirs):{
SUBDIRS = $$SANKORE_PRO $$PLUGIN_CFF_ADAPTOR_PRO
} else:{
SUBDIRS = $$PLUGIN_CFF_ADAPTOR_PRO $$SANKORE_PRO
}
$$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO

@ -0,0 +1,6 @@
HEADERS += plugins/cffadaptor/src/UBCFFAdaptor_global.h \
plugins/cffadaptor/src/UBCFFAdaptor.h \
plugins/cffadaptor/src/UBCFFConstants.h \
plugins/cffadaptor/src/UBGlobals.h
SOURCES += plugins/cffadaptor/src/UBCFFAdaptor.cpp
Loading…
Cancel
Save