opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 09:41:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from MattMcNam/master

Browse Source 
Updated CMake with new effect file locations
This commit is contained in:
Jim
2013-12-07 15:03:08 -08:00
parent 4c256cc0de a76a5937df
commit 6887f00359
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+9
View File
@@ -69,3 +69,12 @@ tags
*.ninja
.ninja*
.dirstamp
#cmake
cmake_install.cmake
CMakeCache.txt
CMakeFiles/
CMakeScripts/
#xcode
*.xcodeproj/
libobs/CMakeLists.txt
+2 -2
View File
@@ -76,5 +76,5 @@ target_link_libraries(libobs
${LIBAVUTIL_LIBRARIES}
${LIBSWRESAMPLE_LIBRARIES})
file(COPY ${obs_SOURCE_DIR}/build/libobs/default.effect DESTINATION
${obs_BINARY_DIR}/libobs/)
file(COPY ${obs_SOURCE_DIR}/build/data/libobs/default.effect DESTINATION
${obs_BINARY_DIR}/data/libobs/)
test/test-input/CMakeLists.txt
+3 -3
View File
@@ -9,6 +9,6 @@ target_link_libraries(test-input
libobs)
file(COPY
${obs_SOURCE_DIR}/build/data/test-input/draw.effect
${obs_SOURCE_DIR}/build/data/test-input/test.effect
DESTINATION ${obs_BINARY_DIR}/data/test-input/)
${obs_SOURCE_DIR}/build/data/obs-plugins/test-input/draw.effect
${obs_SOURCE_DIR}/build/data/obs-plugins/test-input/test.effect
DESTINATION ${obs_BINARY_DIR}/data/obs-plugins/test-input/)