diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt index f2e79e45..5c5f8041 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -7,7 +7,9 @@ include_directories("../../NucleusLib") include_directories("../../PubUtilLib/inc") include_directories("../../PubUtilLib") -include_directories(${Bink_INCLUDE_DIR}) +if(Bink_SDK_AVAILABLE) + include_directories(${Bink_INCLUDE_DIR}) +endif() include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${PYTHON_INCLUDE_DIR}) @@ -191,7 +193,10 @@ target_link_libraries(plClient ${PHYSX_LIBRARIES}) target_link_libraries(plClient ${Ogg_LIBRARIES}) target_link_libraries(plClient ${Vorbis_LIBRARIES}) target_link_libraries(plClient ${DirectX_LIBRARIES}) -target_link_libraries(plClient ${Bink_LIBRARIES}) + +if(Bink_SDK_AVAILABLE) + target_link_libraries(plClient ${Bink_LIBRARIES}) +endif() if (WIN32) target_link_libraries(plClient Rpcrt4) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt index 0d9f9696..179fd1c7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -4,7 +4,9 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -include_directories(${Bink_INCLUDE_DIR}) +if(Bink_SDK_AVAILABLE) + include_directories(${Bink_INCLUDE_DIR}) +endif() include_directories(${DirectX_INCLUDE_DIR}) set(plPipeline_SOURCES diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt index 89461c4c..76a16b27 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt @@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -include_directories(${Bink_INCLUDE_DIR}) +if(Bink_SDK_AVAILABLE) + include_directories(${Bink_INCLUDE_DIR}) +endif() set(plSurface_SOURCES hsGMaterial.cpp diff --git a/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake index 3b0b7496..20827fc2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake +++ b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake @@ -1,9 +1,3 @@ -option(Bink_SDK_AVAILABLE "Do we have the Bink SDK?" OFF) - -if(Bink_SDK_AVAILABLE) - add_definitions(-DBINK_SDK_AVAILABLE) -endif(Bink_SDK_AVAILABLE) - find_path(Bink_INCLUDE_DIR bink.h C:/BinkW32 ) @@ -12,4 +6,11 @@ find_library(Bink_LIBRARY NAMES binkw32 PATHS C:/BinkW32 ) -set(Bink_LIBRARIES ${Bink_LIBRARY}) \ No newline at end of file +if(Bink_INCLUDE_DIR AND Bink_LIBRARY) + set(Bink_SDK_AVAILABLE TRUE) + add_definitions(-DBINK_SDK_AVAILABLE) +else() + set(Bink_SDK_AVAILABLE FALSE) +endif() + +set(Bink_LIBRARIES ${Bink_LIBRARY})