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

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