updated include paths (CMake+osxtest) and function prototype (osxtest)

fixes compilation with changes from e5c99175c5
This commit is contained in:
Palana
2013-11-29 20:51:39 +01:00
parent 99b06288ba
commit e230b0e984
5 changed files with 10 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
include_directories(${obs_SOURCE_DIR}/libobs)
include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
find_library(COCOA Cocoa)
include_directories(${COCOA})

View File

@@ -8,8 +8,8 @@
#import <AppKit/AppKit.h>
#import <OpenGL/OpenGL.h>
#include "util/base.h"
#include "obs.h"
#include <util/base.h>
#include <obs.h>
static const int cx = 800;
static const int cy = 600;
@@ -19,7 +19,7 @@ static const int cy = 600;
/* --------------------------------------------------- */
using SourceContext = std::unique_ptr<obs_source,
std::function<void(obs_source_t)>>;
std::function<int(obs_source_t)>>;
static SourceContext autorelease(obs_source_t s)
{
return SourceContext(s, obs_source_release);