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
b9aef0ee
Commit
b9aef0ee
authored
Nov 11, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ONLYOFFICE/core
into develop
parents
147a8216
b4454f67
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
Common/3dParty/cef/build.sh
Common/3dParty/cef/build.sh
+3
-0
Makefile
Makefile
+2
-2
No files found.
Common/3dParty/cef/build.sh
0 → 100644
View file @
b9aef0ee
#!/bin/bash
echo
"build: OK!"
Makefile
View file @
b9aef0ee
...
...
@@ -88,7 +88,7 @@ TARGETS += $(LIBXML)
TARGETS
+=
$(LICENSEMANAGER)
X2T_PRO
:=
$(
abspath
X2tConverter/build/Qt/X2tSLN.pro
)
HTMLFILEINTERNAL_PRO
:=
$(
abspath
../
core-ext
/HtmlFile/Internal/Internal.pro
)
HTMLFILEINTERNAL_PRO
:=
$(
abspath
../
desktop-sdk
/HtmlFile/Internal/Internal.pro
)
ALLFONTSGEN_PRO
:=
$(
abspath
DesktopEditor/AllFontsGen/AllFontsGen.pro
)
XLSFORMATLIB_PRO
:=
$(
abspath
ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro
)
ODFFILEWRITERLIB_PRO
:=
$(
abspath
ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
)
...
...
@@ -110,7 +110,7 @@ DJVUFILE_PRO := $(abspath DjVuFile/DjVuFile.pro)
XPSFILE_PRO
:=
$(
abspath
XpsFile/XpsFile.pro
)
HTMLFILE_PRO
:=
$(
abspath
HtmlFile/HtmlFile.pro
)
UNICODECONVERTER_PRO
:=
$(
abspath
UnicodeConverter/UnicodeConverter.pro
)
ASCDOCUMENTSCORE_PRO
:=
$(
abspath
../
core-ext
/ChromiumBasedEditors/lib/AscDocumentsCore_linux.pro
)
ASCDOCUMENTSCORE_PRO
:=
$(
abspath
../
desktop-sdk
/ChromiumBasedEditors/lib/AscDocumentsCore_linux.pro
)
LIBXML_PRO
:=
$(
abspath
DesktopEditor/xml/build/qt/libxml2.pro
)
LICENSEMANAGER_PRO
:=
$(
abspath
LicenceManager/linux/LicenseManager.pro
)
...
...
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