Browse Source

Fix Bink dependencies if the Bink SDK isn't found

Michael Hansen 14 years ago
parent
commit
bdd5b7802d
  1. 9
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt
  2. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
  3. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt
  4. 13
      MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake

9
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt

@ -7,7 +7,9 @@ include_directories("../../NucleusLib")
include_directories("../../PubUtilLib/inc") include_directories("../../PubUtilLib/inc")
include_directories("../../PubUtilLib") 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(${OPENAL_INCLUDE_DIR})
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${PYTHON_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 ${Ogg_LIBRARIES})
target_link_libraries(plClient ${Vorbis_LIBRARIES}) target_link_libraries(plClient ${Vorbis_LIBRARIES})
target_link_libraries(plClient ${DirectX_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) if (WIN32)
target_link_libraries(plClient Rpcrt4) target_link_libraries(plClient Rpcrt4)

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt

@ -4,7 +4,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${Bink_INCLUDE_DIR}) if(Bink_SDK_AVAILABLE)
include_directories(${Bink_INCLUDE_DIR})
endif()
include_directories(${DirectX_INCLUDE_DIR}) include_directories(${DirectX_INCLUDE_DIR})
set(plPipeline_SOURCES set(plPipeline_SOURCES

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt

@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${Bink_INCLUDE_DIR}) if(Bink_SDK_AVAILABLE)
include_directories(${Bink_INCLUDE_DIR})
endif()
set(plSurface_SOURCES set(plSurface_SOURCES
hsGMaterial.cpp hsGMaterial.cpp

13
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 find_path(Bink_INCLUDE_DIR bink.h
C:/BinkW32 C:/BinkW32
) )
@ -12,4 +6,11 @@ find_library(Bink_LIBRARY NAMES binkw32
PATHS C:/BinkW32 PATHS C:/BinkW32
) )
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}) set(Bink_LIBRARIES ${Bink_LIBRARY})
Loading…
Cancel
Save