pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67930 954022d7-b5bf-4e40-9824-e11837661b57

Browse Source
This commit is contained in:
Oleg.Korshul
2016-02-03 13:55:47 +00:00
committed by Alexander Trofimov
parent e6f9466bd2
commit 290302a16e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HtmlFile/HtmlFile.cpp
View File

@ -262,7 +262,7 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
if (std::string::npos != sProgramm.find_last_of('/')) if (std::string::npos != sProgramm.find_last_of('/'))
sLibraryDir = "LD_LIBRARY_PATH=" + sProgramm.substr(0, sProgramm.find_last_of('/')); sLibraryDir = "LD_LIBRARY_PATH=" + sProgramm.substr(0, sProgramm.find_last_of('/'));
#if 0 #ifdef asc_static_link_libstd
const char* nargs[2]; const char* nargs[2];
nargs[0] = sXmlA.c_str(); nargs[0] = sXmlA.c_str();
nargs[1] = NULL; nargs[1] = NULL;
@ -277,7 +277,6 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
(char * const *)nenv); (char * const *)nenv);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
#else #else
const char* nargs[6]; const char* nargs[6];
nargs[0] = "-a"; nargs[0] = "-a";
nargs[1] = "--auto-servernum"; nargs[1] = "--auto-servernum";
@ -294,6 +293,7 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
execve("/usr/bin/xvfb-run", (char * const *)nargs, (char * const *)nenv); execve("/usr/bin/xvfb-run", (char * const *)nargs, (char * const *)nenv);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
#endif #endif
break; break;
} }
default: // parent process, pid now contains the child pid default: // parent process, pid now contains the child pid

3
HtmlFile/HtmlFile.pro
View File

@ -49,7 +49,8 @@ DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
LIBS += -L$$DESTDIR -lUnicodeConverter LIBS += -L$$DESTDIR -lUnicodeConverter
#CONFIG += static_link_libstd #CONFIG += static_link_libstd
static_link_libstd { static_link_libstd {
DEFINES += asc_static_link_libstd
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DESTDIR_POSTFIX = _static_stdlib DESTDIR_POSTFIX = _static_stdlib
DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX DESTDIR = $$DESTDIR$$DESTDIR_POSTFIX