james/ndi-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for x86 build on windows

Browse Source
This commit is contained in:
Naoto Kondo
2022-03-22 18:28:18 +09:00
parent 75341a5442
commit 7244956ee7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -42,8 +42,8 @@ install(
if(WIN32) if(WIN32)
install( install(
FILES FILES
"${NDI_DIR}/Bin/x64/Processing.NDI.Lib.x64.dll" "${NDI_DIR}/Bin/${NDI_ARCH}/Processing.NDI.Lib.${NDI_ARCH}.dll"
"${NDI_DIR}/Bin/x64/Processing.NDI.Lib.Licenses.txt" "${NDI_LICENSE_DIR}/Processing.NDI.Lib.Licenses.txt"
DESTINATION ${CMAKE_INSTALL_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}
) )
elseif(APPLE) elseif(APPLE)

11
cmake/Modules/FindNDI.cmake
View File

@@ -3,10 +3,15 @@ if(WIN32)
set(NDI_FOUND TRUE) set(NDI_FOUND TRUE)
set(NDI_DIR $ENV{NDI_SDK_DIR}) set(NDI_DIR $ENV{NDI_SDK_DIR})
string(REPLACE "\\" "/" NDI_DIR "${NDI_DIR}") string(REPLACE "\\" "/" NDI_DIR "${NDI_DIR}")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(NDI_ARCH "x86")
else()
set(NDI_ARCH "x64")
endif()
set(NDI_INCLUDE_DIR "${NDI_DIR}/Include") set(NDI_INCLUDE_DIR "${NDI_DIR}/Include")
set(NDI_LIBRARY_DIR "${NDI_DIR}/Lib/x64") set(NDI_LIBRARY_DIR "${NDI_DIR}/Lib/${NDI_ARCH}")
set(NDI_LICENSE_DIR "${NDI_DIR}/Lib/x64") set(NDI_LICENSE_DIR "${NDI_DIR}/Bin/${NDI_ARCH}")
set(NDI_LIBS "Processing.NDI.Lib.x64") set(NDI_LIBS "Processing.NDI.Lib.${NDI_ARCH}")
else() else()
set(NDI_FOUND FALSE) set(NDI_FOUND FALSE)
endif() endif()