Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
1613ca0a
Commit
1613ca0a
authored
Apr 11, 2012
by
Aleksei Kanash
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CffAdaptor builds separately for debug and for release.
Sankore is adapted to use cffadaptor builds separately.
parent
e870c310
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
Sankore_3.1.pro
Sankore_3.1.pro
+2
-5
UBCFFAdaptor.pro
plugins/cffadaptor/UBCFFAdaptor.pro
+24
-13
No files found.
Sankore_3.1.pro
View file @
1613ca0a
...
...
@@ -109,8 +109,9 @@ MOC_DIR = $$BUILD_DIR/moc
RCC_DIR = $$BUILD_DIR/rcc
UI_DIR = $$BUILD_DIR/ui
LIBS += "-Lplugins/cffadaptor/$$BUILD_DIR/lib" "-lCFF_Adaptor"
win32 {
LIBS += "-Lplugins/cffadaptor/lib/win32" "-lCFF_Adaptor"
RC_FILE = resources/win/sankore.rc
CONFIG += qaxcontainer
exists(console):CONFIG += console
...
...
@@ -131,7 +132,6 @@ win32 {
}
macx {
LIBS += "-Lplugins/cffadaptor/lib/macx" "-lCFF_Adaptor"
LIBS += -framework Foundation
LIBS += -lcrypto
LIBS += -framework AppKit
...
...
@@ -329,7 +329,6 @@ macx {
}
linux-g++ {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
...
...
@@ -345,7 +344,6 @@ linux-g++ {
}
linux-g++-32 {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
...
...
@@ -361,7 +359,6 @@ linux-g++-32 {
}
linux-g++-64 {
LIBS += "-Lplugins/cffadaptor/lib/linux" "-lCFF_Adaptor"
LIBS += -lcrypto
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
...
...
plugins/cffadaptor/UBCFFAdaptor.pro
View file @
1613ca0a
...
...
@@ -4,6 +4,9 @@
#
#-------------------------------------------------
TARGET
=
CFF_Adaptor
TEMPLATE
=
lib
win32
:
SUB_DIR
=
win32
macx
:
SUB_DIR
=
macx
linux
-
g
++:
SUB_DIR
=
linux
...
...
@@ -13,11 +16,21 @@ linux-g++-64: SUB_DIR = linux
THIRD_PARTY_PATH
=
..
/../../
Sankore
-
ThirdParty
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
/
INCLUDEPATH
+=
$$
THIRD_PARTY_PATH
/
quazip
/
include
(
$$
THIRD_PARTY_PATH
/
quazip
/
quazip
.
pri
)
win32
{
CONFIG
+=
dll
}
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"
...
...
@@ -25,15 +38,17 @@ QT += xml xmlpatterns core
QT
+=
gui
QT
+=
svg
TARGET
=
CFF_Adaptor
TEMPLATE
=
lib
win32
{
CONFIG
+=
dll
}
DEFINES
+=
UBCFFADAPTOR_LIBRARY
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
+=
\
src
/
UBCFFAdaptor
.
cpp
...
...
@@ -43,9 +58,5 @@ HEADERS +=\
src
/
UBCFFAdaptor_global
.
h
\
src
/
UBCFFConstants
.
h
OBJECTS_DIR
=
$$
PWD
/
objects
MOC_DIR
=
$$
PWD
/
moc
DESTDIR
=
$$
PWD
/
lib
/
$$
SUB_DIR
RESOURCES
+=
\
resources
/
resources
.
qrc
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment