AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compile fixes

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -73,22 +73,25 @@ else()
endif()
set(BOO_SYS_LIBS ${BOO_SYS_LIBS} CACHE PATH "Boo System Libraries" FORCE)
include_directories(include)
add_library(Boo
lib/inputdev/CafeProPad.cpp include/inputdev/CafeProPad.hpp
lib/inputdev/RevolutionPad.cpp include/inputdev/RevolutionPad.hpp
lib/inputdev/DolphinSmashAdapter.cpp include/inputdev/DolphinSmashAdapter.hpp
lib/inputdev/DualshockPad.cpp include/inputdev/DualshockPad.hpp
lib/inputdev/GenericPad.cpp include/inputdev/GenericPad.hpp
lib/inputdev/DeviceBase.cpp include/inputdev/DeviceBase.hpp
lib/inputdev/DeviceSignature.cpp include/inputdev/DeviceSignature.hpp
include/inputdev/IHIDListener.hpp
lib/inputdev/CafeProPad.cpp include/boo/inputdev/CafeProPad.hpp
lib/inputdev/RevolutionPad.cpp include/boo/inputdev/RevolutionPad.hpp
lib/inputdev/DolphinSmashAdapter.cpp include/boo/inputdev/DolphinSmashAdapter.hpp
lib/inputdev/DualshockPad.cpp include/boo/inputdev/DualshockPad.hpp
lib/inputdev/GenericPad.cpp include/boo/inputdev/GenericPad.hpp
lib/inputdev/DeviceBase.cpp include/boo/inputdev/DeviceBase.hpp
lib/inputdev/DeviceSignature.cpp include/boo/inputdev/DeviceSignature.hpp
include/boo/inputdev/IHIDListener.hpp
lib/inputdev/IHIDDevice.hpp
include/IGraphicsContext.hpp
include/IWindow.hpp
include/IApplication.hpp
include/boo.hpp
include/boo/IGraphicsContext.hpp
include/boo/IWindow.hpp
include/boo/IApplication.hpp
include/boo/boo.hpp
InputDeviceClasses.cpp
${PLAT_SRCS})
add_subdirectory(test)

4
InputDeviceClasses.cpp
View File

@ -1,5 +1,5 @@
#include "inputdev/DeviceSignature.hpp"
#include "inputdev/DolphinSmashAdapter.hpp"
#include "boo/inputdev/DeviceSignature.hpp"
#include "boo/inputdev/DolphinSmashAdapter.hpp"
namespace boo
{

33
include/IApplication.hpp → include/boo/IApplication.hpp
View File

@ -1,6 +1,7 @@
#ifndef IRUNLOOP_HPP
#define IRUNLOOP_HPP
#include <memory>
#include <string>
#include <vector>
@ -55,28 +56,30 @@ public:
};
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=true);
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=true);
extern IApplication* APP;
static inline IApplication* IApplicationBootstrap(IApplication::EPlatformType platform,
IApplicationCallback& cb,
const std::string& uniqueName,
const std::string& friendlyName,
int argc, char** argv,
bool singleInstance=true)
static inline std::shared_ptr<IApplication>
ApplicationBootstrap(IApplication::EPlatformType platform,
IApplicationCallback& cb,
const std::string& uniqueName,
const std::string& friendlyName,
int argc, const char** argv,
bool singleInstance=true)
{
if (APP)
return APP;
return std::shared_ptr<IApplication>(APP);
std::vector<std::string> args;
for (int i=1 ; i<argc ; ++i)
args.push_back(argv[i]);
return IApplicationBootstrap(platform, cb, uniqueName, friendlyName, argv[0], args, singleInstance);
return ApplicationBootstrap(platform, cb, uniqueName, friendlyName, argv[0], args, singleInstance);
}
}

0
include/IGraphicsContext.hpp → include/boo/IGraphicsContext.hpp
View File

0
include/IWindow.hpp → include/boo/IWindow.hpp
View File

0
include/boo.hpp → include/boo/boo.hpp
View File

0
include/inputdev/CafeProPad.hpp → include/boo/inputdev/CafeProPad.hpp
View File

0
include/inputdev/DeviceBase.hpp → include/boo/inputdev/DeviceBase.hpp
View File

0
include/inputdev/DeviceFinder.hpp → include/boo/inputdev/DeviceFinder.hpp
View File

0
include/inputdev/DeviceSignature.hpp → include/boo/inputdev/DeviceSignature.hpp
View File

0
include/inputdev/DeviceToken.hpp → include/boo/inputdev/DeviceToken.hpp
View File

0
include/inputdev/DolphinSmashAdapter.hpp → include/boo/inputdev/DolphinSmashAdapter.hpp
View File

0
include/inputdev/DualshockPad.hpp → include/boo/inputdev/DualshockPad.hpp
View File

0
include/inputdev/GenericPad.hpp → include/boo/inputdev/GenericPad.hpp
View File

0
include/inputdev/IHIDListener.hpp → include/boo/inputdev/IHIDListener.hpp
View File

0
include/inputdev/RevolutionPad.hpp → include/boo/inputdev/RevolutionPad.hpp
View File

2
lib/inputdev/CafeProPad.cpp
View File

@ -1 +1 @@
#include "inputdev/CafeProPad.hpp"
#include "boo/inputdev/CafeProPad.hpp"

4
lib/inputdev/DeviceBase.cpp
View File

@ -1,5 +1,5 @@
#include "inputdev/DeviceBase.hpp"
#include "inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceToken.hpp"
#include "IHIDDevice.hpp"
namespace boo

6
lib/inputdev/DeviceSignature.cpp
View File

@ -1,6 +1,6 @@
#include "inputdev/DeviceSignature.hpp"
#include "inputdev/DeviceToken.hpp"
#include "inputdev/GenericPad.hpp"
#include "boo/inputdev/DeviceSignature.hpp"
#include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/GenericPad.hpp"
#include "IHIDDevice.hpp"
namespace boo

2
lib/inputdev/DolphinSmashAdapter.cpp
View File

@ -1,4 +1,4 @@
#include "inputdev/DolphinSmashAdapter.hpp"
#include "boo/inputdev/DolphinSmashAdapter.hpp"
#include <stdio.h>
#include <string.h>

2
lib/inputdev/DualshockPad.cpp
View File

@ -1 +1 @@
#include "inputdev/DualshockPad.hpp"
#include "boo/inputdev/DualshockPad.hpp"

4
lib/inputdev/GenericPad.cpp
View File

@ -1,5 +1,5 @@
#include "inputdev/GenericPad.hpp"
#include "inputdev/DeviceToken.hpp"
#include "boo/inputdev/GenericPad.hpp"
#include "boo/inputdev/DeviceToken.hpp"
namespace boo
{

4
lib/inputdev/HIDDeviceUdev.cpp
View File

@ -1,6 +1,6 @@
#include "IHIDDevice.hpp"
#include "inputdev/DeviceToken.hpp"
#include "inputdev/DeviceBase.hpp"
#include "boo/inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceBase.hpp"
#include <thread>
#include <mutex>
#include <condition_variable>

4
lib/inputdev/HIDListenerUdev.cpp
View File

@ -1,5 +1,5 @@
#include "inputdev/IHIDListener.hpp"
#include "inputdev/DeviceFinder.hpp"
#include "boo/inputdev/IHIDListener.hpp"
#include "boo/inputdev/DeviceFinder.hpp"
#include <libudev.h>
#include <string.h>
#include <stdio.h>

2
lib/inputdev/IHIDDevice.hpp
View File

@ -1,7 +1,7 @@
#ifndef IHIDDEVICE_HPP
#define IHIDDEVICE_HPP
#include "inputdev/DeviceToken.hpp"
#include "boo/inputdev/DeviceToken.hpp"
namespace boo
{

2
lib/inputdev/RevolutionPad.cpp
View File

@ -1 +1 @@
#include "inputdev/RevolutionPad.hpp"
#include "boo/inputdev/RevolutionPad.hpp"

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);
}
}

2
lib/x11/ApplicationWayland.hpp
View File

@ -2,7 +2,7 @@
#error This file may only be included from CApplicationUnix.cpp
#endif
#include "IApplication.hpp"
#include "boo/IApplication.hpp"
#include <dbus/dbus.h>
DBusConnection* registerDBus(const char* appName, bool& isFirst);

2
lib/x11/ApplicationXCB.hpp
View File

@ -2,7 +2,7 @@
#error This file may only be included from CApplicationUnix.cpp
#endif
#include "IApplication.hpp"
#include "boo/IApplication.hpp"
#define explicit explicit_c
#include <xcb/xcb.h>

4
lib/x11/GraphicsContextWayland.cpp
View File

@ -1,5 +1,5 @@
#include "IGraphicsContext.hpp"
#include "IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IWindow.hpp"
namespace boo
{

4
lib/x11/GraphicsContextXCB.cpp
View File

@ -1,5 +1,5 @@
#include "IGraphicsContext.hpp"
#include "IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IWindow.hpp"
#include <xcb/xcb.h>
#include <xcb/glx.h>

4
lib/x11/WindowWayland.cpp
View File

@ -1,5 +1,5 @@
#include "IWindow.hpp"
#include "IGraphicsContext.hpp"
#include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
namespace boo
{

6
lib/x11/WindowXCB.cpp
View File

@ -1,6 +1,6 @@
#include "IWindow.hpp"
#include "IGraphicsContext.hpp"
#include "IApplication.hpp"
#include "boo/IWindow.hpp"
#include "boo/IGraphicsContext.hpp"
#include "boo/IApplication.hpp"
#include <xcb/xcb.h>
#include <xcb/xcb_event.h>

2
test/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable(booTest main.cpp ../InputDeviceClasses.cpp)
add_executable(booTest main.cpp)
target_link_libraries(booTest Boo ${BOO_SYS_LIBS})

10
test/main.cpp
View File

@ -1,5 +1,5 @@
#include <stdio.h>
#include <boo.hpp>
#include <boo/boo.hpp>
namespace boo
{
@ -134,13 +134,13 @@ struct TestApplicationCallback : IApplicationCallback
}
int main(int argc, char** argv)
int main(int argc, const char** argv)
{
boo::TestApplicationCallback appCb;
boo::IApplication* app = IApplicationBootstrap(boo::IApplication::PLAT_AUTO,
appCb, "rwk", "RWK", argc, argv);
std::shared_ptr<boo::IApplication> app =
ApplicationBootstrap(boo::IApplication::PLAT_AUTO,
appCb, "rwk", "RWK", argc, argv);
app->run();
delete app;
printf("IM DYING!!\n");
return 0;
}