Browse Source

Merge pull request #7 from MattMcNam/master

Updated CMake with new effect file locations
Jim 12 years ago
parent
commit
6887f00359
3 changed files with 14 additions and 5 deletions
  1. 9 0
      .gitignore
  2. 2 2
      libobs/CMakeLists.txt
  3. 3 3
      test/test-input/CMakeLists.txt

+ 9 - 0
.gitignore

@@ -69,3 +69,12 @@ tags
 *.ninja
 .ninja*
 .dirstamp
+
+#cmake
+cmake_install.cmake
+CMakeCache.txt
+CMakeFiles/
+CMakeScripts/
+
+#xcode
+*.xcodeproj/

+ 2 - 2
libobs/CMakeLists.txt

@@ -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/)

+ 3 - 3
test/test-input/CMakeLists.txt

@@ -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/)