jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for 32/64bit environment variables

Browse Source 
This can make it a bit easier to set up 32bit/64bit environments
separately on windows.  This simply allows you to additionally set
FFmpegPath32, FFmpegPath64, x264Path32, x264Path64, etc.
This commit is contained in:
jp9000 2014-07-18 20:05:42 -07:00
parent 85701b0925
commit f2d2b58ae2
8 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/FindJansson.cmake
View File

@ -20,10 +20,13 @@ else()
set(_lib_suffix 32)
endif()
set(JANSSON_PATH_ARCH JanssonPath${_lib_suffix})
find_path(Jansson_INCLUDE_DIR
NAMES jansson.h
HINTS
ENV JanssonPath
ENV ${JANSSON_PATH_ARCH}
${_JANSSON_INCLUDE_DIRS}
/usr/include /usr/local/include /opt/local/include /sw/include)

4
cmake/Modules/FindLibavcodec.cmake
View File

@ -23,12 +23,15 @@ else()
set(_lib_suffix 32)
endif()
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(FFMPEG_INCLUDE_DIR
NAMES libavcodec/avcodec.h
HINTS
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH}
"${_AVCODEC_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav)
@ -39,6 +42,7 @@ else()
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVCODEC_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

4
cmake/Modules/FindLibavformat.cmake
View File

@ -19,12 +19,15 @@ else()
set(_lib_suffix 32)
endif()
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(FFMPEG_INCLUDE_DIR
NAMES libavformat/avformat.h
HINTS
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH}
"${_AVFORMAT_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav)
@ -35,6 +38,7 @@ else()
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVFORMAT_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

4
cmake/Modules/FindLibavutil.cmake
View File

@ -19,12 +19,15 @@ else()
set(_lib_suffix 32)
endif()
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(FFMPEG_INCLUDE_DIR
NAMES libavutil/avutil.h
HINTS
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH}
"${_AVUTIL_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav)
@ -35,6 +38,7 @@ else()
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_AVUTIL_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

6
cmake/Modules/FindLibfdk.cmake
View File

@ -23,6 +23,9 @@ else()
set(_lib_suffix 32)
endif()
set(LIBFDK_PATH_ARCH LibfdkPath${_lib_suffix})
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(Libfdk_INCLUDE_DIR
NAMES fdk-aac/aacenc_lib.h
HINTS
@ -30,6 +33,8 @@ else()
"$ENV{obsAdditionalInstallFiles}/include"
ENV LibfdkPath
ENV FFmpegPath
ENV ${LIBFDK_PATH_ARCH}
ENV ${FFMPEG_PATH_ARCH}
"${_LIBFDK_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include)
@ -39,6 +44,7 @@ else()
"${Libfdk_INCLUDE_DIR}/../lib"
"${Libfdk_INCLUDE_DIR}/../lib${_lib_suffix}"
"${Libfdk_INCLUDE_DIR}/../libs${_lib_suffix}"
"${Libfdk_INCLUDE_DIR}/lib"
"${Libfdk_INCLUDE_DIR}/lib${_lib_suffix}"
"${_LIBFDK_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

4
cmake/Modules/FindLibswresample.cmake
View File

@ -19,12 +19,15 @@ else()
set(_lib_suffix 32)
endif()
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(FFMPEG_INCLUDE_DIR
NAMES libswresample/swresample.h
HINTS
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH}
"${_SWRESAMPLE_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav)
@ -35,6 +38,7 @@ else()
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_SWRESAMPLE_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

4
cmake/Modules/FindLibswscale.cmake
View File

@ -19,12 +19,15 @@ else()
set(_lib_suffix 32)
endif()
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(FFMPEG_INCLUDE_DIR
NAMES libswscale/swscale.h
HINTS
"${CMAKE_SOURCE_DIR}/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
ENV ${FFMPEG_PATH_ARCH}
"${_SWSCALE_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav)
@ -35,6 +38,7 @@ else()
"${FFMPEG_INCLUDE_DIR}/../lib"
"${FFMPEG_INCLUDE_DIR}/../lib${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/../libs${_lib_suffix}"
"${FFMPEG_INCLUDE_DIR}/lib"
"${FFMPEG_INCLUDE_DIR}/lib${_lib_suffix}"
"${_SWSCALE_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)

6
cmake/Modules/FindLibx264.cmake
View File

@ -23,6 +23,9 @@ else()
set(_lib_suffix 32)
endif()
set(X264_PATH_ARCH x264Path${_lib_suffix})
set(FFMPEG_PATH_ARCH FFmpegPath${_lib_suffix})
find_path(X264_INCLUDE_DIR
NAMES x264.h
HINTS
@ -30,6 +33,8 @@ else()
"$ENV{obsAdditionalInstallFiles}/include"
ENV x264Path
ENV FFmpegPath
ENV ${X264_PATH_ARCH}
ENV ${FFMPEG_PATH_ARCH}
"${_X264_INCLUDE_DIRS}"
/usr/include /usr/local/include /opt/local/include /sw/include)
@ -39,6 +44,7 @@ else()
"${X264_INCLUDE_DIR}/../lib"
"${X264_INCLUDE_DIR}/../lib${_lib_suffix}"
"${X264_INCLUDE_DIR}/../libs${_lib_suffix}"
"${X264_INCLUDE_DIR}/lib"
"${X264_INCLUDE_DIR}/lib${_lib_suffix}"
"${_X264_LIBRARY_DIRS}"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib)