jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fixes compilation with changes from e5c99175c55e3b08493058d4aefcf31f62018ac1
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs-opengl/CMakeLists.txt
View File

@ -14,7 +14,7 @@ endif()
option(USE_STATIC_GLEW "Build using bundled GLEW" ${WIN32})
include_directories(${obs_SOURCE_DIR}/libobs)
include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIRS})
@ -26,7 +26,7 @@ if(NOT USE_STATIC_GLEW)
include_directories(${GLEW_INCLUDE_DIRS})
set(GLEW_SRC)
else()
include_directories(glew/include)
include_directories(SYSTEM glew/include)
add_definitions(-DGLEW_STATIC)
set(GLEW_SRC glew/src/glew.c)
endif()

4
obs/CMakeLists.txt
View File

@ -10,6 +10,7 @@ function(wx_required_version)
endforeach()
set(CMAKE_REQUIRED_DEFINITIONS ${WX_CHECK_DEFINITIONS})
set(CMAKE_REQUIRED_INCLUDES ${wxWidgets_INCLUDE_DIRS})
set(CMAKE_REQUIRED_FLAGS ${wxWidgets_CXX_FLAGS})
check_cxx_source_compiles("
#include <wx/sysopt.h>
#if (wxMINOR_VERSION < 9 && wxMAJOR_VERSION <= 2) || wxMAJOR_VERSION < 3
@ -24,8 +25,9 @@ function(wx_required_version)
endfunction()
wx_required_version()
include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
link_libraries(${wxWidgets_LIBRARIES})
link_libraries(${wxWidgets_LIBRARIES} libobs)
add_executable(obs
window-obs-basic.cpp

2
test/osx/CMakeLists.txt
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})

6
test/osx/test.mm
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);

2
test/test-input/CMakeLists.txt
View File

@ -1,4 +1,4 @@
include_directories(${obs_SOURCE_DIR}/libobs)
include_directories(SYSTEM ${obs_SOURCE_DIR}/libobs)
add_library(test-input MODULE
test-filter.c