Added Subdirs.pro. It allows us to build Sankore with it's plugins as one project. We can add Third-Party to it later.

Changed cffAdaptor. Now generated library will be copyed to Sankore3.1 folder undwe windows and to Sankore3.1.app/Contents/MacOS folder under macx.
Added postScript_mac.sh for copying libs under mac.

Changed Sankore_3.1.pro - now all files placed in groups by it's place in project folders.
preferencesAboutTextFull
Aleksei Kanash 13 years ago
parent 67541aa8b1
commit c4f97bafed
  1. 1
      Sankore_3.1.pro
  2. 34
      Subdirs.pro
  3. 9
      plugins/cffadaptor/UBCFFAdaptor.pro
  4. 5
      plugins/cffadaptor/postScript_mac.sh

@ -3,6 +3,7 @@ TEMPLATE = app
THIRD_PARTY_PATH=../Sankore-ThirdParty THIRD_PARTY_PATH=../Sankore-ThirdParty
CONFIG -= flat
CONFIG += debug_and_release \ CONFIG += debug_and_release \
no_include_pwd no_include_pwd

@ -0,0 +1,34 @@
TEMPLATE = subdirs
CONFIG += recursive
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
SUBDIRS += $$SANKORE_PRO
if(exists($$PLUGIN_CFF_ADAPTOR_DIR)){
SUBDIRS += $$PLUGIN_CFF_ADAPTOR_PRO
$$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO
}
recurse_target = $$SANKORE_PRO

@ -16,7 +16,7 @@ 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"
BUILD_DIR = $$PWD/build/$$SUB_DIR BUILD_DIR = build/$$SUB_DIR
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) {
BUILD_DIR = $$BUILD_DIR/release BUILD_DIR = $$BUILD_DIR/release
@ -31,6 +31,13 @@ OBJECTS_DIR = $$BUILD_DIR/objects
MOC_DIR = $$BUILD_DIR/moc MOC_DIR = $$BUILD_DIR/moc
DESTDIR = $$BUILD_DIR/lib DESTDIR = $$BUILD_DIR/lib
RCC_DIR = $$BUILD_DIR/rcc RCC_DIR = $$BUILD_DIR/rcc
SANKORE_DIR = ../..
win32:{
QMAKE_POST_LINK += copy $$replace(DESTDIR,/,\\)\\CFF_Adaptor.dll" $$replace(SANKORE_DIR,/,\\)\\CFF_Adaptor.dll /y"
}
macx:{
QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS"
}
LIBS += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip" LIBS += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip"

@ -0,0 +1,5 @@
#!/bin/bash
SOURCE=$1
DESTINATION=$2
mkdir -p $DESTINATION
cp -R $SOURCE/ $DESTINATION
Loading…
Cancel
Save