Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated CMake with new effect file locations #7

Merged
merged 1 commit into from Dec 7, 2013
+14 −5
Merged

Updated CMake with new effect file locations #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -69,3 +69,12 @@ tags
*.ninja
.ninja*
.dirstamp

#cmake
cmake_install.cmake
CMakeCache.txt
CMakeFiles/
CMakeScripts/

#xcode
*.xcodeproj/
4 changes: 2 additions & 2 deletions libobs/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -72,5 +72,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/)
6 changes: 3 additions & 3 deletions test/test-input/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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/)