diff --git a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt index 8e2b6a84..33124d73 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the clie find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client find_package(DirectX REQUIRED) -#find_package(BINK REQUIRED) #TODO: Find Bink, but don't require it if plPipeline isn't built... +find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built... # Or better yet, just eliminate bink altogether option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt index 3907c400..f2e79e45 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories("../../NucleusLib") include_directories("../../PubUtilLib/inc") include_directories("../../PubUtilLib") +include_directories(${Bink_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${PYTHON_INCLUDE_DIR}) @@ -190,6 +191,7 @@ 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 (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 39084eb5..0d9f9696 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") +include_directories(${Bink_INCLUDE_DIR}) 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 f03327d1..89461c4c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt @@ -3,6 +3,8 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") +include_directories(${Bink_INCLUDE_DIR}) + set(plSurface_SOURCES hsGMaterial.cpp plGrassShaderMod.cpp diff --git a/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake new file mode 100644 index 00000000..3b0b7496 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake @@ -0,0 +1,15 @@ +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 +) + +find_library(Bink_LIBRARY NAMES binkw32 + PATHS C:/BinkW32 +) + +set(Bink_LIBRARIES ${Bink_LIBRARY}) \ No newline at end of file