@@ -28,12 +28,11 @@ if(WIN32)
2828 string (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} " )
2929 message ("${CMAKE_CXX_FLAGS_RELEASE} " )
3030
31+ set (OBS_BUILDDIR_ARCH "build" )
3132 if (ARCH EQUAL 64)
3233 set (OBS_ARCH_NAME "64bit" )
33- set (OBS_BUILDDIR_ARCH "build64" )
3434 else ()
3535 set (OBS_ARCH_NAME "32bit" )
36- set (OBS_BUILDDIR_ARCH "build32" )
3736 add_definitions (/arch:SSE2)
3837 endif ()
3938
@@ -48,32 +47,34 @@ if(WIN32)
4847 COMMAND if $<CONFIG:Release>==1 (
4948 "${CMAKE_COMMAND} " -E make_directory
5049 "${RELEASE_DIR} /data/obs-plugins/obs-streamlink"
51- "${RELEASE_DIR} /obs-plugins/${OBS_ARCH_NAME} " )
50+ "${RELEASE_DIR} /obs-plugins/${OBS_ARCH_NAME} " ) else (call)
5251
5352 COMMAND if $<CONFIG:Release>==1 (
5453 "${CMAKE_COMMAND} " -E copy_directory
5554 "${PROJECT_SOURCE_DIR} /data"
56- "${RELEASE_DIR} /data/obs-plugins/obs-streamlink" )
55+ "${RELEASE_DIR} /data/obs-plugins/obs-streamlink" ) else (call)
5756
5857 COMMAND if $<CONFIG:Release>==1 (
5958 "${CMAKE_COMMAND} " -E copy
6059 "$<TARGET_FILE:obs-streamlink>"
61- "${RELEASE_DIR} /obs-plugins/${OBS_ARCH_NAME} " )
60+ "${RELEASE_DIR} /obs-plugins/${OBS_ARCH_NAME} " ) else (call)
61+ )
6262
63+ add_custom_command (TARGET obs-streamlink POST_BUILD
6364 # Copy to obs-studio dev environment for immediate testing
6465 COMMAND if $<CONFIG:Debug>==1 (
6566 "${CMAKE_COMMAND} " -E copy
6667 "$<TARGET_FILE:obs-streamlink>"
67- "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/obs-plugins/${OBS_ARCH_NAME} " )
68+ "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/obs-plugins/${OBS_ARCH_NAME} " ) else (call)
6869
6970 COMMAND if $<CONFIG:Debug>==1 (
7071 "${CMAKE_COMMAND} " -E make_directory
71- "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/data/obs-plugins/obs-streamlink" )
72+ "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/data/obs-plugins/obs-streamlink" ) else (call)
7273
7374 COMMAND if $<CONFIG:Debug>==1 (
7475 "${CMAKE_COMMAND} " -E copy_directory
7576 "${PROJECT_SOURCE_DIR} /data"
76- "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/data/obs-plugins/obs-streamlink" )
77+ "${LIBOBS_INCLUDE_DIR} /../${OBS_BUILDDIR_ARCH} /rundir/$<CONFIG>/data/obs-plugins/obs-streamlink" ) else (call)
7778 )
7879endif ()
7980
0 commit comments