From a2654f8a8f1a5f0bfd196b357e023c7f355bfc65 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@open-sankore.org>
Date: Thu, 2 Aug 2012 11:30:11 +0200
Subject: [PATCH] some cosmetics
---
Sankore_3.1.pro | 78 ++++++++-------------------------------------
Subdirs.pro | 33 -------------------
plugins/plugins.pri | 6 ++++
3 files changed, 19 insertions(+), 98 deletions(-)
delete mode 100644 Subdirs.pro
create mode 100644 plugins/plugins.pri
diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 9da0c92a..c6c5bfac 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -7,19 +7,6 @@ CONFIG -= flat
CONFIG += debug_and_release \
no_include_pwd
-linux-g++-64 {
- CONFIG += link_prl
-}
-
-
-linux-g++-32 {
- CONFIG += link_prl
-}
-
-
-linux-g++ {
- CONFIG += link_prl
-}
VERSION_MAJ = 2
VERSION_MIN = 00
@@ -46,7 +33,6 @@ QT += script
QT += xmlpatterns
INCLUDEPATH += src
-INCLUDEPATH += plugins/cffadaptor/src
include($$THIRD_PARTY_PATH/libs.pri)
include(src/adaptors/adaptors.pri)
@@ -70,6 +56,13 @@ include(src/customWidgets/customWidgets.pri)
DEPENDPATH += src/pdf-merger
INCLUDEPATH += src/pdf-merger
include(src/pdf-merger/pdfMerger.pri)
+
+#plugins
+include(plugins/plugins.pri)
+INCLUDEPATH += plugins/cffadaptor/src
+
+
+#ThirdParty
DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
include($$THIRD_PARTY_PATH/quazip/quazip.pri)
@@ -103,9 +96,7 @@ BUILD_DIR = build
macx:BUILD_DIR = $$BUILD_DIR/macx
win32:BUILD_DIR = $$BUILD_DIR/win32
-linux-g++:BUILD_DIR = $$BUILD_DIR/linux
-linux-g++-32:BUILD_DIR = $$BUILD_DIR/linux
-linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux
+linux-g++*:BUILD_DIR = $$BUILD_DIR/linux
CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
CONFIG(release, debug|release) {
@@ -119,16 +110,12 @@ MOC_DIR = $$BUILD_DIR/moc
RCC_DIR = $$BUILD_DIR/rcc
UI_DIR = $$BUILD_DIR/ui
-#LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
-
win32 {
RC_FILE = resources/win/sankore.rc
CONFIG += qaxcontainer
exists(console):CONFIG += console
- QMAKE_CXXFLAGS += \
- /MP
- QMAKE_CXXFLAGS_RELEASE += /Od \
- /Zi
+ QMAKE_CXXFLAGS += /MP
+ QMAKE_CXXFLAGS_RELEASE += /Od /Zi
QMAKE_LFLAGS_RELEASE += /DEBUG
UB_LIBRARY.path = $$DESTDIR
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")
}
-linux-g++ {
- 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++-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 {
+linux-g++* {
+ message(LINUX)
+ CONFIG += link_prl
LIBS += -lcrypto
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp
@@ -442,12 +399,3 @@ INSTALLS = UB_ETC \
UB_LIBRARY \
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
-
diff --git a/Subdirs.pro b/Subdirs.pro
deleted file mode 100644
index 192aeaf7..00000000
--- a/Subdirs.pro
+++ /dev/null
@@ -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
diff --git a/plugins/plugins.pri b/plugins/plugins.pri
new file mode 100644
index 00000000..ddf3113a
--- /dev/null
+++ b/plugins/plugins.pri
@@ -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