Browse Source

BinkSDK finding

Adam Johnson 14 years ago
parent
commit
8717acccb9
  1. 2
      MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt
  2. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt
  3. 1
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
  4. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/CMakeLists.txt
  5. 15
      MOULOpenSourceClientPlugin/Plasma20/cmake/FindBink.cmake

2
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(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(Speex REQUIRED) #TODO: Not required if we aren't building the client
find_package(DirectX REQUIRED) 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 # Or better yet, just eliminate bink altogether
option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)

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

@ -7,6 +7,7 @@ include_directories("../../NucleusLib")
include_directories("../../PubUtilLib/inc") include_directories("../../PubUtilLib/inc")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${Bink_INCLUDE_DIR})
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})
@ -190,6 +191,7 @@ 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 (WIN32) if (WIN32)
target_link_libraries(plClient Rpcrt4) target_link_libraries(plClient Rpcrt4)

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

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

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

@ -3,6 +3,8 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${Bink_INCLUDE_DIR})
set(plSurface_SOURCES set(plSurface_SOURCES
hsGMaterial.cpp hsGMaterial.cpp
plGrassShaderMod.cpp plGrassShaderMod.cpp

15
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})
Loading…
Cancel
Save