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

-CMakeFiles
-CMakeCache.txt
-*.cmake

build/copy_debug64.bat

-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

-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

-!*.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)

plugins/linux-xshm/CMakeLists.txt

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

plugins/mac-avcapture/CMakeLists.txt

@@ -38,4 +38,4 @@ target_link_libraries(mac-avcapture
 	${COCOA})
 
 install_obs_plugin(mac-avcapture)
-install_obs_plugin_data(mac-avcapture ../../build/data/obs-plugins/mac-avcapture)
+install_obs_plugin_data(mac-avcapture data)

plugins/mac-capture/CMakeLists.txt

@@ -38,4 +38,4 @@ target_link_libraries(mac-capture
 	${COCOA})
 
 install_obs_plugin(mac-capture)
-install_obs_plugin_data(mac-capture ../../build/data/obs-plugins/mac-capture)
+install_obs_plugin_data(mac-capture data)

plugins/obs-ffmpeg/CMakeLists.txt

@@ -46,4 +46,4 @@ target_link_libraries(obs-ffmpeg
 	${LIBSWRESAMPLE_LIBRARIES})
 
 install_obs_plugin(obs-ffmpeg)
-install_obs_plugin_data(obs-ffmpeg ../../build/data/obs-plugins/obs-ffmpeg)
+install_obs_plugin_data(obs-ffmpeg data)

plugins/obs-libfdk/CMakeLists.txt

@@ -19,4 +19,4 @@ target_link_libraries(obs-libfdk
 	${LIBFDK_LIBRARIES})
 
 install_obs_plugin(obs-libfdk)
-install_obs_plugin_data(obs-libfdk ../../build/data/obs-plugins/obs-libfdk)
+install_obs_plugin_data(obs-libfdk data)

plugins/obs-outputs/CMakeLists.txt

@@ -55,4 +55,4 @@ target_link_libraries(obs-outputs
 	${obs-outputs_PLATFORM_DEPS})
 
 install_obs_plugin(obs-outputs)
-install_obs_plugin_data(obs-outputs ../../build/data/obs-plugins/obs-outputs)
+install_obs_plugin_data(obs-outputs data)

plugins/obs-x264/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(obs-x264
 	${LIBX264_LIBRARIES})
 
 install_obs_plugin(obs-x264)
-install_obs_plugin_data(obs-x264 ../../build/data/obs-plugins/obs-x264)
+install_obs_plugin_data(obs-x264 data)

plugins/rtmp-services/CMakeLists.txt

@@ -14,4 +14,4 @@ target_link_libraries(rtmp-services
 	${OBS_JANSSON_IMPORT})
 
 install_obs_plugin(rtmp-services)
-install_obs_plugin_data(rtmp-services ../../build/data/obs-plugins/rtmp-services)
+install_obs_plugin_data(rtmp-services data)

plugins/win-capture/CMakeLists.txt

@@ -17,4 +17,4 @@ target_link_libraries(win-capture
 	psapi.lib)
 
 install_obs_plugin(win-capture)
-install_obs_plugin_data(win-capture ../../build/data/obs-plugins/win-capture)
+install_obs_plugin_data(win-capture data)

plugins/win-dshow/CMakeLists.txt

@@ -32,4 +32,4 @@ target_link_libraries(win-dshow
 	strmiids.lib)
 
 install_obs_plugin(win-dshow)
-install_obs_plugin_data(win-dshow ../../build/data/obs-plugins/win-dshow)
+install_obs_plugin_data(win-dshow data)

plugins/win-wasapi/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(win-wasapi
 	libobs)
 
 install_obs_plugin(win-wasapi)
-install_obs_plugin_data(win-wasapi ../../build/data/obs-plugins/win-wasapi)
+install_obs_plugin_data(win-wasapi data)

test/test-input/CMakeLists.txt

@@ -21,4 +21,4 @@ target_link_libraries(test-input
 	${test-input_PLATFORM_DEPS}
 	libobs)
 
-install_obs_plugin_data(test-input ../../build/data/obs-plugins/test-input)
+install_obs_plugin_data(test-input data)