Move all data into the subdir it belongs to

Completely removes the build dir in favor of cmake based build layouting

.gitignore

@@ -45,7 +45,6 @@ libtool
 ltmain.sh
 
 *.dmg
-*.json
 *.app
 .DS_Store
 
@@ -95,6 +94,7 @@ tags
 
 #cmake
 cmbuild/
+build/
 
 #xcode
 *.xcodeproj/

build/.gitignore

@@ -1,3 +0,0 @@
-CMakeFiles
-CMakeCache.txt
-*.cmake

build/copy_debug64.bat

@@ -1,5 +0,0 @@
-copy ..\vs\2010\x64\Debug\libobs.dll bin\64bit
-copy ..\vs\2010\x64\Debug\libobs-opengl.dll bin\64bit
-copy ..\vs\2010\x64\Debug\libobs-d3d11.dll bin\64bit
-copy ..\vs\2010\x64\Debug\wintest.exe bin\64bit
-copy ..\vs\2010\x64\Debug\test-input.dll plugins\64bit

build/copy_release64.bat

@@ -1,5 +0,0 @@
-copy ..\vs\2010\x64\Release\libobs.dll bin\64bit
-copy ..\vs\2010\x64\Release\libobs-opengl.dll bin\64bit
-copy ..\vs\2010\x64\Release\libobs-d3d11.dll bin\64bit
-copy ..\vs\2010\x64\Release\wintest.exe bin\64bit
-copy ..\vs\2010\x64\Release\test-input.dll plugins\64bit

build/data/.gitignore

@@ -1 +0,0 @@
-!*.json

libobs/CMakeLists.txt

@@ -285,5 +285,5 @@ target_link_libraries(libobs
 		${LIBAVUTIL_LIBRARIES})
 
 install_obs_core(libobs EXPORT LibObs)
-install_obs_data(libobs ../build/data/libobs libobs)
+install_obs_data(libobs data libobs)
 install_obs_headers(${libobs_HEADERS})

obs/CMakeLists.txt

@@ -128,5 +128,5 @@ target_link_libraries(obs
 	${obs_PLATFORM_LIBRARIES})
 
 install_obs_core(obs)
-install_obs_data(obs ../build/data/obs-studio obs-studio)
+install_obs_data(obs data obs-studio)
 

plugins/image-source/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(image-source
 	libobs)
 
 install_obs_plugin(image-source)
-install_obs_plugin_data(image-source ../../build/data/obs-plugins/image-source)
+install_obs_plugin_data(image-source data)

plugins/linux-pulseaudio/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(linux-pulseaudio
 )
 
 install_obs_plugin(linux-pulseaudio)
-install_obs_plugin_data(linux-pulseaudio ../../build/data/obs-plugins/linux-pulseaudio)
+install_obs_plugin_data(linux-pulseaudio data)

plugins/linux-v4l2/CMakeLists.txt

@@ -13,4 +13,4 @@ target_link_libraries(linux-v4l2
 )
 
 install_obs_plugin(linux-v4l2)
-install_obs_plugin_data(linux-v4l2 ../../build/data/obs-plugins/linux-v4l2)
+install_obs_plugin_data(linux-v4l2 data)

plugins/linux-xcomposite/CMakeLists.txt

@@ -26,4 +26,4 @@ target_link_libraries(linux-xcomposite
 	${X11_Xcomposite_LIB})
 
 install_obs_plugin(linux-xcomposite)
-install_obs_plugin_data(linux-xcomposite ../../build/data/obs-plugins/linux-xcomposite)
+install_obs_plugin_data(linux-xcomposite data)