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
de3545fe
Commit
de3545fe
authored
Apr 06, 2016
by
Alexey.Golubev
Committed by
Alexander Trofimov
May 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed build errors
parent
38815a78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
UnicodeConverter/UnicodeConverter.pro
UnicodeConverter/UnicodeConverter.pro
+6
-6
XpsFile/XpsFile.cpp
XpsFile/XpsFile.cpp
+1
-1
No files found.
UnicodeConverter/UnicodeConverter.pro
View file @
de3545fe
...
@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) {
...
@@ -32,7 +32,7 @@ CONFIG(debug, debug|release) {
}
else
{
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_64
}
}
ICU_BUILDS_PLATFORM
=
win64
ICU_BUILDS_PLATFORM
=
win
_
64
}
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
CONFIG
(
debug
,
debug
|
release
)
{
...
@@ -40,16 +40,16 @@ CONFIG(debug, debug|release) {
...
@@ -40,16 +40,16 @@ CONFIG(debug, debug|release) {
}
else
{
}
else
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
win_32
}
}
ICU_BUILDS_PLATFORM
=
win32
ICU_BUILDS_PLATFORM
=
win
_
32
}
}
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_64
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_64
ICU_BUILDS_PLATFORM
=
linux64
ICU_BUILDS_PLATFORM
=
linux
_
64
}
}
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_32
DESTDIR
=
$$
DESTINATION_SDK_PATH
/
linux_32
ICU_BUILDS_PLATFORM
=
linux32
ICU_BUILDS_PLATFORM
=
linux
_
32
}
}
mac
{
mac
{
...
@@ -79,8 +79,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
...
@@ -79,8 +79,8 @@ linux-g++ | linux-g++-64 | linux-g++-32 {
TARGET_EXT
=
.
so
TARGET_EXT
=
.
so
INCLUDEPATH
+=
$$
PWD
/
icubuilds
/
$$
ICU_BUILDS_PLATFORM
/
usr
/
local
/
include
INCLUDEPATH
+=
$$
PWD
/
icubuilds
/
$$
ICU_BUILDS_PLATFORM
/
usr
/
local
/
include
LIBS
+=
$$
PWD
/
icubuilds
/
$$
ICU_BUILDS_PLATFORM
/
usr
/
local
/
lib
/
libicuuc
.
so
.
55
LIBS
+=
$$
PWD
/
../
build
/
bin
/
icu
/
$$
ICU_BUILDS_PLATFORM
/
libicuuc
.
so
.
55
LIBS
+=
$$
PWD
/
icubuilds
/
$$
ICU_BUILDS_PLATFORM
/
usr
/
local
/
lib
/
libicudata
.
so
.
55
LIBS
+=
$$
PWD
/
../
build
/
bin
/
icu
/
$$
ICU_BUILDS_PLATFORM
/
libicudata
.
so
.
55
message
(
linux
)
message
(
linux
)
}
}
...
...
XpsFile/XpsFile.cpp
View file @
de3545fe
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include "../DesktopEditor/graphics/GraphicsRenderer.h"
#include "../DesktopEditor/graphics/GraphicsRenderer.h"
#include "../PdfWriter/PdfRenderer.h"
#include "../PdfWriter/PdfRenderer.h"
#include "../
ASCOfficeUtils/ASCOfficeUtilsLib
/OfficeUtils.h"
#include "../
OfficeUtils/src
/OfficeUtils.h"
using
namespace
XPS
;
using
namespace
XPS
;
...
...
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