diff --git a/Common/3dParty/cef/fetch.sh b/Common/3dParty/cef/fetch.sh index 4fd70c9c04..6a46be3d56 100755 --- a/Common/3dParty/cef/fetch.sh +++ b/Common/3dParty/cef/fetch.sh @@ -37,7 +37,14 @@ mkdir "build" fi cef_binary=cef_binary cef_arch=$cef_binary.7z -cef_url=http://d2ettrnqo7v976.cloudfront.net/cef/3163/$platform$arch/$cef_arch +cef_version="3163" + +if [[ "$platform" == *"linux"* ]] +then +cef_version="3202" +fi + +cef_url=http://d2ettrnqo7v976.cloudfront.net/cef/$cef_version/$platform$arch/$cef_arch if [[ "$platform" == *"linux"* ]] then diff --git a/HtmlFile/HtmlFile.cpp b/HtmlFile/HtmlFile.cpp index 01d2b98eea..b4b7811110 100644 --- a/HtmlFile/HtmlFile.cpp +++ b/HtmlFile/HtmlFile.cpp @@ -398,9 +398,9 @@ int CHtmlFile::Convert(const std::vector& arFiles, const std::wstr const char* nenv[4]; nenv[0] = sLibraryDir.c_str(); - nenv[1] = "LD_PRELOAD=./libcef.so"; - nenv[2] = "DISPLAY=:0"; - nenv[3] = NULL; + nenv[1] = "DISPLAY=:0"; + nenv[2] = NULL; + nenv[3] = NULL; execve(sProgramm.c_str(), (char * const *)nargs, @@ -419,9 +419,8 @@ int CHtmlFile::Convert(const std::vector& arFiles, const std::wstr const char* nenv[4]; nenv[0] = sLibraryDir.c_str(); - nenv[1] = "LD_PRELOAD=./libcef.so"; - nenv[2] = NULL;//"DISPLAY=:99"; - nenv[3] = NULL; + nenv[1] = NULL;//"DISPLAY=:99"; + nenv[2] = NULL; execve("/usr/bin/xvfb-run", (char * const *)nargs, (char * const *)nenv); exit(EXIT_SUCCESS); diff --git a/HtmlFile/test/test.pro b/HtmlFile/test/test.pro index 8d176010a9..01a5f468e4 100644 --- a/HtmlFile/test/test.pro +++ b/HtmlFile/test/test.pro @@ -16,6 +16,11 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY +CORE_ROOT_DIR = $$PWD/../.. +PWD_ROOT_DIR = $$PWD +include($$CORE_ROOT_DIR/Common/base.pri) +include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri) + CONFIG(debug, debug|release) { DESTDIR = $$PWD/Debug } else { @@ -25,41 +30,10 @@ CONFIG(debug, debug|release) { CONFIG += c++11 TEMPLATE = app -############### destination path ############### -DESTINATION_SDK_PATH = $$PWD/../../build/lib - -# WINDOWS -win32:contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64/DEBUG -} else { - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64 -} -} -win32:!contains(QMAKE_TARGET.arch, x86_64):{ -CONFIG(debug, debug|release) { - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32/DEBUG -} else { - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32 -} -} - -linux-g++:contains(QMAKE_HOST.arch, x86_64):{ - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64 -} -linux-g++:!contains(QMAKE_HOST.arch, x86_64):{ - DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32 -} - -LIBS += -L$$DESTINATION_SDK_PATH -lHtmlFile -LIBS += -L$$DESTINATION_SDK_PATH -lUnicodeConverter -LIBS += -L$$DESTINATION_SDK_PATH -lgraphics +LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics -lHtmlFile linux-g++ | linux-g++-64 | linux-g++-32 { QMAKE_LFLAGS += -Wl,--rpath=./ - - LIBS += $$PWD/../../build/bin/icu/linux_64/libicuuc.so.55 - LIBS += $$PWD/../../build/bin/icu/linux_64/libicudata.so.55 message(linux) } @@ -67,9 +41,6 @@ win32 { LIBS += -ladvapi32 \ -luser32 \ -lshell32 - -LIBS += -L$$PWD/../../build/bin/icu/win_64/ -licudt -LIBS += -L$$PWD/../../build/bin/icu/win_64/ -licuuc } SOURCES += main.cpp