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

Fixed for OS X version - in progress

meow-7.2.2
Callum Prentice 2015-06-08 16:47:16 -07:00
parent d0320020b3
commit 6c20327357
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/CEFPlugin.cmake
View File

@ -19,5 +19,11 @@ if (WINDOWS)
llceflib.lib
)
elseif (DARWIN)
set(CEF_PLUGIN_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
${ARCH_PREBUILT_DIRS_RELEASE}/libLLCefLib.a
#${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
)
elseif (LINUX)
endif (WINDOWS)

14
indra/media_plugins/cef/media_plugin_cef.cpp
View File

@ -34,7 +34,8 @@
#include "llpluginmessageclasses.h"
#include "media_plugin_base.h"
#include <functional>
#include "../../../build-darwin-i386/packages/include/boost/function.hpp"
#include "../../../build-darwin-i386/packages/include/boost/bind.hpp"
#include "llCEFLib.h"
#include <time.h> // remove me
@ -67,7 +68,7 @@ private:
}
}
void MediaPluginCEF::postDebugMessage(const std::string& msg);
void postDebugMessage(const std::string& msg);
bool mEnableMediaPluginDebugging;
LLCEFLib* mLLCEFLib;
@ -186,9 +187,14 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
if (message_name == "init")
{
mLLCEFLib->setPageChangedCallback(std::bind(&MediaPluginCEF::pageChangedCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
mLLCEFLib->setPageChangedCallback(boost::bind(&MediaPluginCEF::pageChangedCallback, this, _1, _2, _3));
bool result = mLLCEFLib->init(1024, 1024);
LLCEFLibSettings settings;
settings.inital_width = 1024;
settings.inital_height = 1024;
settings.javascript_enabled = true;
settings.cookies_enabled = true;
bool result = mLLCEFLib->init(settings);
if (!result)
{
//MessageBoxA(0, "FAIL INIT", 0, 0);