livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a dullahan version for GCC5+, this is exactly the same source as the "normal" version, just compiled on Ubuntu 16.04 with GCC 5.4.0. This allows self compilers to compile with a newer GCC instead of alwayss having to fall back to GCC 4.9.x

master
Nicky 2018-05-22 05:01:34 +02:00
parent 1443a95e7a
commit 61008b4059
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autobuild.xml
View File

@ -3,6 +3,36 @@
<map>
<key>installables</key>
<map>
<key>dullahan-gcc5</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2017, Linden Research, Inc.</string>
<key>description</key>
<string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
<key>license</key>
<string>MPL</string>
<key>license_file</key>
<string>LICENSES/LICENSE.txt</string>
<key>name</key>
<string>dullahan-gcc5</string>
<key>platforms</key>
<map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>cffd8a7f9d8e55ecd50c72cc39b41f3d</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/dullahan_gcc5-1.1.1080_3.3325.1750.gaabe4c4-linux64-181420123.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
<key>version</key>
<string>1.1.1080_3.3325.1750.gaabe4c4</string>
</map>
<key>ndPhysicsStub</key>
<map>
<key>license</key>

5
indra/cmake/CEFPlugin.cmake
View File

@ -6,7 +6,12 @@ if (USESYSTEMLIBS)
set(CEFPLUGIN OFF CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS)
if (LINUX AND ( CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 5 ) )
message( "Using dullahan for GCC >= 5 " )
use_prebuilt_binary(dullahan-gcc5)
else()
use_prebuilt_binary(dullahan)
endif()
set(CEFPLUGIN ON CACHE BOOL
"CEFPLUGIN support for the llplugin/llmedia test apps.")
set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)