Fix CMake scripts to link static dependencies
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't fail silently to find the libraries correctly. Modified top-level CMakelists.txt: - Correctly set include dirs, preprocessor definitions, and add libraries for static Ogre plugins. - Correctly set preprocessor definitions for static MyGUI. Modified launcher, openmw, and opencs to link the static Ogre plugins. Fixed FindSDL2.cmake to set a variable that contains only the SDL2 library, so that the launcher doesn't incorrectly link against SDL2main. Fixed FindMyGUI.cmake to correctly look for static variants. Fixed FindOgre.cmake to set variables for DirectX plugins correctly.deque
slothlife
11 years ago
parent
4f4a37896e
commit
20dabaead9
@ -0,0 +1,72 @@
|
||||
#-------------------------------------------------------------------
|
||||
# This file is part of the CMake build system for OGRE
|
||||
# (Object-oriented Graphics Rendering Engine)
|
||||
# For the latest info, see http://www.ogre3d.org/
|
||||
#
|
||||
# The contents of this file are placed in the public domain. Feel
|
||||
# free to make use of it in any way you like.
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Find DirectX9 SDK
|
||||
# Define:
|
||||
# DirectX9_FOUND
|
||||
# DirectX9_INCLUDE_DIR
|
||||
# DirectX9_LIBRARY
|
||||
# DirectX9_ROOT_DIR
|
||||
|
||||
if(WIN32) # The only platform it makes sense to check for DirectX9 SDK
|
||||
include(FindPkgMacros)
|
||||
findpkg_begin(DirectX9)
|
||||
|
||||
# Get path, convert backslashes as ${ENV_DXSDK_DIR}
|
||||
getenv_path(DXSDK_DIR)
|
||||
getenv_path(DirectX_HOME)
|
||||
getenv_path(DirectX_ROOT)
|
||||
getenv_path(DirectX_BASE)
|
||||
|
||||
# construct search paths
|
||||
set(DirectX9_PREFIX_PATH
|
||||
"${DXSDK_DIR}" "${ENV_DXSDK_DIR}"
|
||||
"${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}"
|
||||
"${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}"
|
||||
"${DIRECTX_BASE}" "${ENV_DIRECTX_BASE}"
|
||||
"C:/apps_x86/Microsoft DirectX SDK*"
|
||||
"C:/Program Files (x86)/Microsoft DirectX SDK*"
|
||||
"C:/apps/Microsoft DirectX SDK*"
|
||||
"C:/Program Files/Microsoft DirectX SDK*"
|
||||
"$ENV{ProgramFiles}/Microsoft DirectX SDK*"
|
||||
)
|
||||
|
||||
create_search_paths(DirectX9)
|
||||
# redo search if prefix path changed
|
||||
clear_if_changed(DirectX9_PREFIX_PATH
|
||||
DirectX9_LIBRARY
|
||||
DirectX9_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_path(DirectX9_INCLUDE_DIR NAMES d3d9.h D3DCommon.h HINTS ${DirectX9_INC_SEARCH_PATH})
|
||||
# dlls are in DirectX9_ROOT_DIR/Developer Runtime/x64|x86
|
||||
# lib files are in DirectX9_ROOT_DIR/Lib/x64|x86
|
||||
if(CMAKE_CL_64)
|
||||
set(DirectX9_LIBPATH_SUFFIX "x64")
|
||||
else(CMAKE_CL_64)
|
||||
set(DirectX9_LIBPATH_SUFFIX "x86")
|
||||
endif(CMAKE_CL_64)
|
||||
find_library(DirectX9_LIBRARY NAMES d3d9 HINTS ${DirectX9_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX9_LIBPATH_SUFFIX})
|
||||
find_library(DirectX9_D3DX9_LIBRARY NAMES d3dx9 HINTS ${DirectX9_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX9_LIBPATH_SUFFIX})
|
||||
find_library(DirectX9_DXERR_LIBRARY NAMES DxErr HINTS ${DirectX9_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX9_LIBPATH_SUFFIX})
|
||||
find_library(DirectX9_DXGUID_LIBRARY NAMES dxguid HINTS ${DirectX9_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX9_LIBPATH_SUFFIX})
|
||||
|
||||
findpkg_finish(DirectX9)
|
||||
set(DirectX9_LIBRARIES ${DirectX9_LIBRARIES}
|
||||
${DirectX9_D3DX9_LIBRARY}
|
||||
${DirectX9_DXERR_LIBRARY}
|
||||
${DirectX9_DXGUID_LIBRARY}
|
||||
)
|
||||
|
||||
mark_as_advanced(DirectX9_D3DX9_LIBRARY DirectX9_DXERR_LIBRARY DirectX9_DXGUID_LIBRARY
|
||||
DirectX9_DXGI_LIBRARY DirectX9_D3DCOMPILER_LIBRARY)
|
||||
|
||||
|
||||
endif(WIN32)
|
||||
@ -0,0 +1,114 @@
|
||||
#-------------------------------------------------------------------
|
||||
# This file is part of the CMake build system for OGRE
|
||||
# (Object-oriented Graphics Rendering Engine)
|
||||
# For the latest info, see http://www.ogre3d.org/
|
||||
#
|
||||
# The contents of this file are placed in the public domain. Feel
|
||||
# free to make use of it in any way you like.
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Find DirectX11 SDK
|
||||
# Define:
|
||||
# DirectX11_FOUND
|
||||
# DirectX11_INCLUDE_DIR
|
||||
# DirectX11_LIBRARY
|
||||
# DirectX11_ROOT_DIR
|
||||
|
||||
if(WIN32) # The only platform it makes sense to check for DirectX11 SDK
|
||||
include(FindPkgMacros)
|
||||
findpkg_begin(DirectX11)
|
||||
|
||||
# Get path, convert backslashes as ${ENV_DXSDK_DIR}
|
||||
getenv_path(DXSDK_DIR)
|
||||
getenv_path(DIRECTX_HOME)
|
||||
getenv_path(DIRECTX_ROOT)
|
||||
getenv_path(DIRECTX_BASE)
|
||||
|
||||
# construct search paths
|
||||
set(DirectX11_PREFIX_PATH
|
||||
"${DXSDK_DIR}" "${ENV_DXSDK_DIR}"
|
||||
"${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}"
|
||||
"${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}"
|
||||
"${DIRECTX_BASE}" "${ENV_DIRECTX_BASE}"
|
||||
"C:/apps_x86/Microsoft DirectX SDK*"
|
||||
"C:/Program Files (x86)/Microsoft DirectX SDK*"
|
||||
"C:/apps/Microsoft DirectX SDK*"
|
||||
"C:/Program Files/Microsoft DirectX SDK*"
|
||||
"$ENV{ProgramFiles}/Microsoft DirectX SDK*"
|
||||
)
|
||||
|
||||
if(OGRE_BUILD_PLATFORM_WINRT)
|
||||
# Windows 8 SDK has custom layout
|
||||
set(DirectX11_INC_SEARCH_PATH
|
||||
"C:/Program Files (x86)/Windows Kits/8.0/Include/shared"
|
||||
"C:/Program Files (x86)/Windows Kits/8.0/Include/um"
|
||||
)
|
||||
set(DirectX11_LIB_SEARCH_PATH
|
||||
"C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um"
|
||||
)
|
||||
endif()
|
||||
|
||||
create_search_paths(DirectX11)
|
||||
# redo search if prefix path changed
|
||||
clear_if_changed(DirectX11_PREFIX_PATH
|
||||
DirectX11_LIBRARY
|
||||
DirectX11_INCLUDE_DIR
|
||||
)
|
||||
|
||||
# dlls are in DirectX11_ROOT_DIR/Developer Runtime/x64|x86
|
||||
# lib files are in DirectX11_ROOT_DIR/Lib/x64|x86
|
||||
if(CMAKE_CL_64)
|
||||
set(DirectX11_LIBPATH_SUFFIX "x64")
|
||||
else(CMAKE_CL_64)
|
||||
set(DirectX11_LIBPATH_SUFFIX "x86")
|
||||
endif(CMAKE_CL_64)
|
||||
|
||||
# look for D3D11 components
|
||||
find_path(DirectX11_INCLUDE_DIR NAMES D3D11Shader.h HINTS ${DirectX11_INC_SEARCH_PATH})
|
||||
find_library(DirectX11_DXERR_LIBRARY NAMES DxErr HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
find_library(DirectX11_DXGUID_LIBRARY NAMES dxguid HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
find_library(DirectX11_DXGI_LIBRARY NAMES dxgi HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
find_library(DirectX11_D3DCOMPILER_LIBRARY NAMES d3dcompiler HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
|
||||
find_library(DirectX11_LIBRARY NAMES d3d11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
find_library(DirectX11_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
|
||||
if (DirectX11_INCLUDE_DIR AND DirectX11_LIBRARY)
|
||||
set(DirectX11_D3D11_FOUND TRUE)
|
||||
set(DirectX11_INCLUDE_DIR ${DirectX11_INCLUDE_DIR})
|
||||
set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES}
|
||||
${DirectX11_LIBRARY}
|
||||
${DirectX11_DXGI_LIBRARY}
|
||||
${DirectX11_DXGUID_LIBRARY}
|
||||
${DirectX11_D3DCOMPILER_LIBRARY}
|
||||
)
|
||||
endif ()
|
||||
if (DirectX11_D3DX11_LIBRARY)
|
||||
set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_D3DX11_LIBRARY})
|
||||
endif ()
|
||||
if (DirectX11_DXERR_LIBRARY)
|
||||
set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_DXERR_LIBRARY})
|
||||
endif ()
|
||||
|
||||
findpkg_finish(DirectX11)
|
||||
|
||||
set(DirectX11_LIBRARIES
|
||||
${DirectX11_D3D11_LIBRARIES}
|
||||
)
|
||||
|
||||
if (OGRE_BUILD_PLATFORM_WINDOWS_PHONE)
|
||||
set(DirectX11_FOUND TRUE)
|
||||
set(DirectX11_INCLUDE_DIR "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/WPSDK/WP80/include" CACHE STRING "" FORCE)
|
||||
set(DirectX11_LIBRARY "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/WPSDK/WP80/lib" CACHE STRING "" FORCE)
|
||||
set(DirectX11_LIBRARIES ${DirectX11_LIBRARY})
|
||||
set(CMAKE_CXX_FLAGS "/EHsc" CACHE STRING "" FORCE)
|
||||
endif ()
|
||||
|
||||
mark_as_advanced(DirectX11_INCLUDE_DIR
|
||||
DirectX11_D3D11_LIBRARIES
|
||||
DirectX11_D3DX11_LIBRARY
|
||||
DirectX11_DXERR_LIBRARY
|
||||
DirectX11_DXGUID_LIBRARY
|
||||
DirectX11_DXGI_LIBRARY
|
||||
DirectX11_D3DCOMPILER_LIBRARY)
|
||||
endif(WIN32)
|
||||
Loading…
Reference in New Issue