Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
eb4d10c7
Commit
eb4d10c7
authored
Jul 20, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
static libs pro files change
parent
43a9a0e3
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
58 additions
and
1194 deletions
+58
-1194
Common/base.pri
Common/base.pri
+3
-0
DesktopEditor/Qt_build/graphics/project/graphics.pri
DesktopEditor/Qt_build/graphics/project/graphics.pri
+5
-23
DesktopEditor/Qt_build/graphics/project/graphics.pro
DesktopEditor/Qt_build/graphics/project/graphics.pro
+4
-934
DesktopEditor/Qt_build/graphics/project/graphics_fonts.pri
DesktopEditor/Qt_build/graphics/project/graphics_fonts.pri
+1
-1
DesktopEditor/doctrenderer/doctrenderer.pro
DesktopEditor/doctrenderer/doctrenderer.pro
+0
-6
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pri
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pri
+0
-14
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro
+4
-31
DesktopEditor/xml/build/qt/libxml2.pri
DesktopEditor/xml/build/qt/libxml2.pri
+7
-7
DesktopEditor/xml/build/qt/libxml2.pro
DesktopEditor/xml/build/qt/libxml2.pro
+5
-119
OfficeUtils/OfficeUtils.pri
OfficeUtils/OfficeUtils.pri
+24
-26
OfficeUtils/OfficeUtils.pro
OfficeUtils/OfficeUtils.pro
+5
-33
No files found.
Common/base.pri
View file @
eb4d10c7
...
@@ -127,3 +127,6 @@ core_debug {
...
@@ -127,3 +127,6 @@ core_debug {
plugin {
plugin {
DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
}
}
staticlib {
DESTDIR = $$CORE_BUILDS_LIBRARIES_PATH
}
DesktopEditor/Qt_build/graphics/project/graphics.pri
View file @
eb4d10c7
...
@@ -9,41 +9,23 @@ DEFINES += \
...
@@ -9,41 +9,23 @@ DEFINES += \
MNG_STORE_CHUNKS\
MNG_STORE_CHUNKS\
MNG_ERROR_TELLTALE
MNG_ERROR_TELLTALE
linux-g++ | linux-g++-64 | linux-g++-32
{
core_linux
{
DEFINES += \
DEFINES += \
HAVE_UNISTD_H \
HAVE_UNISTD_H \
LINUX \
_LINUX \
_LINUX_QT
CONFIG += c++11
QMAKE_CXXFLAGS += -Wno-narrowing
QMAKE_CXXFLAGS += -Wno-narrowing
message(linux)
}
}
mac {
core_
mac {
DEFINES += \
DEFINES += \
HAVE_UNISTD_H \
HAVE_UNISTD_H
_LINUX \
_LINUX_QT \
_MAC \
QT_MAC
message(mac)
}
}
win32
{
core_windows
{
DEFINES += \
DEFINES += \
JAS_WIN_MSVC_BUILD \
JAS_WIN_MSVC_BUILD \
WIN32 \
NOMINMAX
NOMINMAX
DEFINES -= UNICODE
DEFINES -= UNICODE
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
message(windows)
}
}
LIB_GRAPHICS_PRI_PATH = $$PWD/../../..
LIB_GRAPHICS_PRI_PATH = $$PWD/../../..
...
@@ -56,7 +38,7 @@ INCLUDEPATH += \
...
@@ -56,7 +38,7 @@ INCLUDEPATH += \
$$LIB_GRAPHICS_PRI_PATH/cximage/png \
$$LIB_GRAPHICS_PRI_PATH/cximage/png \
$$LIB_GRAPHICS_PRI_PATH/cximage/zlib
$$LIB_GRAPHICS_PRI_PATH/cximage/zlib
SOURCES += $$
LIB_GRAPHICS_PRI_PATH/Qt_build/graphics/project
/graphics_pri.cpp
SOURCES += $$
PWD
/graphics_pri.cpp
SOURCES += $$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftbbox.c \
SOURCES += $$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftbbox.c \
$$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftgxval.c \
$$LIB_GRAPHICS_PRI_PATH/freetype-2.5.2/src/base/ftgxval.c \
...
...
DesktopEditor/Qt_build/graphics/project/graphics.pro
View file @
eb4d10c7
This diff is collapsed.
Click to expand it.
DesktopEditor/Qt_build/graphics/project/graphics_fonts.pri
View file @
eb4d10c7
DESKTOPEDITOR_PATH = $$
CORE_ROOT_DIR/DesktopEditor
DESKTOPEDITOR_PATH = $$
PWD/../../..
DEFINES += \
DEFINES += \
_QT \
_QT \
FT2_BUILD_LIBRARY
FT2_BUILD_LIBRARY
...
...
DesktopEditor/doctrenderer/doctrenderer.pro
View file @
eb4d10c7
#-------------------------------------------------
#
#
Project
created
by
QtCreator
2015
-
01
-
19
T10
:
22
:
14
#
#-------------------------------------------------
QT
-=
core
QT
-=
core
QT
-=
gui
QT
-=
gui
...
...
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pri
View file @
eb4d10c7
...
@@ -4,20 +4,6 @@ building_hunspell {
...
@@ -4,20 +4,6 @@ building_hunspell {
DEFINES += BUILDING_LIBHUNSPELL
DEFINES += BUILDING_LIBHUNSPELL
}
}
linux-g++ | linux-g++-64 | linux-g++-32 {
message(linux)
}
mac {
message(mac)
}
win32 {
DEFINES += WIN32
DEFINES += _WIN32
message(windows)
}
INCLUDEPATH += \
INCLUDEPATH += \
$$PWD/../hunspell \
$$PWD/../hunspell \
$$PWD/../win_api
$$PWD/../win_api
...
...
DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro
View file @
eb4d10c7
...
@@ -12,36 +12,9 @@ TEMPLATE = lib
...
@@ -12,36 +12,9 @@ TEMPLATE = lib
CONFIG
+=
staticlib
CONFIG
+=
staticlib
CONFIG
+=
building_hunspell
CONFIG
+=
building_hunspell
include
(
$$
PWD
/
hunspell
.
pri
)
CORE_ROOT_DIR
=
$$
PWD
/../../../..
PWD_ROOT_DIR
=
$$
PWD
###############
destination
path
###############
include
(
$$
CORE_ROOT_DIR
/
Common
/
base
.
pri
)
DESTINATION_SDK_PATH
=
$$
PWD
/../../../../
build
/
lib
#
WINDOWS
win32
:
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
}
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
}
}
linux
-
g
++:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
include
(
$$
PWD
/
hunspell
.
pri
)
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_64
}
linux
-
g
++:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_32
}
mac
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
mac_64
}
################################################
DesktopEditor/xml/build/qt/libxml2.pri
View file @
eb4d10c7
DEFINES += HAVE_VA_COPY
DEFINES += HAVE_VA_COPY
INCLUDEPATH += \
INCLUDEPATH += \
$$
CORE_ROOT_DIR/DesktopEditor/xml
/libxml2/include \
$$
PWD/../..
/libxml2/include \
$$
CORE_ROOT_DIR/DesktopEditor/xml
/libxml2/include/libxml \
$$
PWD/../..
/libxml2/include/libxml \
$$
CORE_ROOT_DIR/DesktopEditor/xml/build/qt
$$
PWD
SOURCES += $$
CORE_ROOT_DIR/DesktopEditor/xml/build/qt
/libxml2_all.c
SOURCES += $$
PWD
/libxml2_all.c
SOURCES += $$
CORE_ROOT_DIR/DesktopEditor/xml/build/qt
/libxml2_all2.c
SOURCES += $$
PWD
/libxml2_all2.c
SOURCES += \
SOURCES += \
$$
CORE_ROOT_DIR/DesktopEditor/xml
/src/xmllight.cpp \
$$
PWD/../..
/src/xmllight.cpp \
$$
CORE_ROOT_DIR/DesktopEditor/xml
/src/xmldom.cpp
$$
PWD/../..
/src/xmldom.cpp
DesktopEditor/xml/build/qt/libxml2.pro
View file @
eb4d10c7
...
@@ -9,123 +9,9 @@ QT -= core gui
...
@@ -9,123 +9,9 @@ QT -= core gui
TARGET
=
libxml
TARGET
=
libxml
TEMPLATE
=
lib
TEMPLATE
=
lib
CONFIG
+=
staticlib
CONFIG
+=
staticlib
QMAKE_CXXFLAGS
+=
-
std
=
c
++
11
-
Wall
-
g
QMAKE_CXXFLAGS
+=
-
Wall
-
g
DEFINES
+=
HAVE_VA_COPY
CONFIG
+=
c
++
11
CORE_ROOT_DIR
=
$$
PWD
/../../../..
PWD_ROOT_DIR
=
$$
PWD
###############
destination
path
###############
include
(..
/../../../
Common
/
base
.
pri
)
DESTINATION_SDK_PATH
=
$$
PWD
/../../../../
build
/
lib
include
(
$$
PWD
/
libxml2
.
pri
)
#
WINDOWS
win32
:
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
}
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
}
}
linux
-
g
++:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_64
}
linux
-
g
++:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_32
}
mac
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
mac_64
}
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
{
DEFINES
+=
\
LINUX
\
_LINUX
}
mac
{
DEFINES
+=
\
_LINUX
\
_MAC
\
MAC
}
win32
{
DEFINES
+=
\
WIN32
\
_WIN32
}
################################################
INCLUDEPATH
+=
\
..
/../
libxml2
/
include
\
..
/../
libxml2
/
include
/
libxml
SOURCES
+=
\
..
/../
libxml2
/
buf
.
c
\
..
/../
libxml2
/
c14n
.
c
\
..
/../
libxml2
/
catalog
.
c
\
..
/../
libxml2
/
chvalid
.
c
\
..
/../
libxml2
/
debugXML
.
c
\
..
/../
libxml2
/
dict
.
c
\
..
/../
libxml2
/
DOCBparser
.
c
\
..
/../
libxml2
/
encoding
.
c
\
..
/../
libxml2
/
entities
.
c
\
..
/../
libxml2
/
error
.
c
\
..
/../
libxml2
/
globals
.
c
\
..
/../
libxml2
/
HTMLparser
.
c
\
..
/../
libxml2
/
HTMLtree
.
c
\
..
/../
libxml2
/
legacy
.
c
\
..
/../
libxml2
/
list
.
c
\
..
/../
libxml2
/
nanoftp
.
c
\
..
/../
libxml2
/
nanohttp
.
c
\
..
/../
libxml2
/
parser
.
c
\
..
/../
libxml2
/
pattern
.
c
\
..
/../
libxml2
/
relaxng
.
c
\
..
/../
libxml2
/
SAX
.
c
\
..
/../
libxml2
/
SAX2
.
c
\
..
/../
libxml2
/
schematron
.
c
\
..
/../
libxml2
/
threads
.
c
\
..
/../
libxml2
/
tree
.
c
\
..
/../
libxml2
/
uri
.
c
\
..
/../
libxml2
/
valid
.
c
\
..
/../
libxml2
/
xinclude
.
c
\
..
/../
libxml2
/
xlink
.
c
\
..
/../
libxml2
/
xmlIO
.
c
\
..
/../
libxml2
/
xmlmemory
.
c
\
..
/../
libxml2
/
xmlmodule
.
c
\
..
/../
libxml2
/
xmlreader
.
c
\
..
/../
libxml2
/
xmlregexp
.
c
\
..
/../
libxml2
/
xmlsave
.
c
\
..
/../
libxml2
/
xmlschemas
.
c
\
..
/../
libxml2
/
xmlschemastypes
.
c
\
..
/../
libxml2
/
xmlstring
.
c
\
..
/../
libxml2
/
xmlunicode
.
c
\
..
/../
libxml2
/
xmlwriter
.
c
\
..
/../
libxml2
/
xpath
.
c
\
..
/../
libxml2
/
xpointer
.
c
\
..
/../
libxml2
/
parserInternals
.
c
\
..
/../
libxml2
/
hash
.
c
SOURCES
+=
\
..
/../
src
/
xmllight
.
cpp
\
..
/../
src
/
xmldom
.
cpp
HEADERS
+=
\
..
/
XML
/
elfgcchack
.
h
\
..
/
XML
/
libxml
.
h
\
unix
{
target
.
path
=
/
usr
/
lib
INSTALLS
+=
target
}
OfficeUtils/OfficeUtils.pri
View file @
eb4d10c7
...
@@ -6,42 +6,40 @@ core_mac {
...
@@ -6,42 +6,40 @@ core_mac {
DEFINES += unix
DEFINES += unix
}
}
SOURCES_UTILS = $$CORE_ROOT_DIR/OfficeUtils/src
build_zlib_as_sources {
build_zlib_as_sources {
DEFINES += BUILD_ZLIB_AS_SOURCES
DEFINES += BUILD_ZLIB_AS_SOURCES
}
}
INCLUDEPATH += \
INCLUDEPATH += \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip \
$$
PWD/src
/zlib-1.2.3/contrib/minizip \
$$
SOURCES_UTILS
/zlib-1.2.3
$$
PWD/src
/zlib-1.2.3
SOURCES += \
SOURCES += \
$$
SOURCES_UTILS
/OfficeUtils.cpp \
$$
PWD/src
/OfficeUtils.cpp \
$$
SOURCES_UTILS
/ZipUtilsCP.cpp \
$$
PWD/src
/ZipUtilsCP.cpp \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/ioapi.c \
$$
PWD/src
/zlib-1.2.3/contrib/minizip/ioapi.c \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/miniunz.c \
$$
PWD/src
/zlib-1.2.3/contrib/minizip/miniunz.c \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/minizip.c \
$$
PWD/src
/zlib-1.2.3/contrib/minizip/minizip.c \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/mztools.c \
$$
PWD/src
/zlib-1.2.3/contrib/minizip/mztools.c \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/unzip.c \
$$
PWD/src
/zlib-1.2.3/contrib/minizip/unzip.c \
$$
SOURCES_UTILS
/zlib-1.2.3/contrib/minizip/zip.c
$$
PWD/src
/zlib-1.2.3/contrib/minizip/zip.c
build_all_zlib {
build_all_zlib {
SOURCES += \
SOURCES += \
$$
SOURCES_UTILS
/zlib-1.2.3/adler32.c \
$$
PWD/src
/zlib-1.2.3/adler32.c \
$$
SOURCES_UTILS
/zlib-1.2.3/compress.c \
$$
PWD/src
/zlib-1.2.3/compress.c \
$$
SOURCES_UTILS
/zlib-1.2.3/crc32.c \
$$
PWD/src
/zlib-1.2.3/crc32.c \
$$
SOURCES_UTILS
/zlib-1.2.3/deflate.c \
$$
PWD/src
/zlib-1.2.3/deflate.c \
$$
SOURCES_UTILS
/zlib-1.2.3/example.c \
$$
PWD/src
/zlib-1.2.3/example.c \
$$
SOURCES_UTILS
/zlib-1.2.3/gzio.c \
$$
PWD/src
/zlib-1.2.3/gzio.c \
$$
SOURCES_UTILS
/zlib-1.2.3/infback.c \
$$
PWD/src
/zlib-1.2.3/infback.c \
$$
SOURCES_UTILS
/zlib-1.2.3/inffast.c \
$$
PWD/src
/zlib-1.2.3/inffast.c \
$$
SOURCES_UTILS
/zlib-1.2.3/inflate.c \
$$
PWD/src
/zlib-1.2.3/inflate.c \
$$
SOURCES_UTILS
/zlib-1.2.3/inftrees.c \
$$
PWD/src
/zlib-1.2.3/inftrees.c \
$$
SOURCES_UTILS
/zlib-1.2.3/minigzip.c \
$$
PWD/src
/zlib-1.2.3/minigzip.c \
$$
SOURCES_UTILS
/zlib-1.2.3/trees.c \
$$
PWD/src
/zlib-1.2.3/trees.c \
$$
SOURCES_UTILS
/zlib-1.2.3/uncompr.c \
$$
PWD/src
/zlib-1.2.3/uncompr.c \
$$
SOURCES_UTILS
/zlib-1.2.3/zutil.c
$$
PWD/src
/zlib-1.2.3/zutil.c
}
}
HEADERS += \
HEADERS += \
...
...
OfficeUtils/OfficeUtils.pro
View file @
eb4d10c7
...
@@ -5,42 +5,14 @@ TEMPLATE = lib
...
@@ -5,42 +5,14 @@ TEMPLATE = lib
CONFIG
+=
staticlib
CONFIG
+=
staticlib
win32
{
win32
{
CONFIG
-=
debug_and_release
debug_and_release_target
CONFIG
+=
build_all_zlib
CONFIG
+=
build_all_zlib
}
###############
destination
path
###############
DESTINATION_SDK_PATH
=
$$
PWD
/../
build
/
lib
#
WINDOWS
win32
:
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
}
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
/
DEBUG
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
}
}
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_64
}
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_32
}
}
mac
{
mac
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
mac_64
QMAKE_MAC_SDK
=
macosx10
.
11
QMAKE_MAC_SDK
=
macosx10
.
11
}
}
################################################
CORE_ROOT_DIR
=
$$
PWD
/..
PWD_ROOT_DIR
=
$$
PWD
include
(
$$
PWD
/
OfficeUtils
.
pri
)
include
(..
/
Common
/
base
.
pri
)
include
(
$$
PWD
/
OfficeUtils
.
pri
))
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