AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-13 23:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

Browse Source
This commit is contained in:
Jack Andersen
2015-08-18 12:43:30 -10:00
parent 395e39d63a
commit 87ab129e01
35 changed files with 78 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/x11/ApplicationUnix.cpp
View File

@@ -6,6 +6,7 @@
#include "ApplicationXCB.hpp"
#include "ApplicationWayland.hpp"
#include <memory>
#include <dbus/dbus.h>
#include <stdio.h>
@@ -47,13 +48,13 @@ namespace boo
{
IApplication* APP = NULL;
IApplication* IApplicationBootstrap(IApplication::EPlatformType platform,
IApplicationCallback& cb,
const std::string& uniqueName,
const std::string& friendlyName,
const std::string& pname,
const std::vector<std::string>& args,
bool singleInstance)
std::shared_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType platform,
IApplicationCallback& cb,
const std::string& uniqueName,
const std::string& friendlyName,
const std::string& pname,
const std::vector<std::string>& args,
bool singleInstance)
{
if (!APP)
{
@@ -63,9 +64,9 @@ IApplication* IApplicationBootstrap(IApplication::EPlatformType platform,
platform == IApplication::PLAT_AUTO)
APP = new ApplicationXCB(cb, uniqueName, friendlyName, pname, args, singleInstance);
else
return NULL;
return std::shared_ptr<IApplication>();
}
return APP;
return std::shared_ptr<IApplication>(APP);
}
}