diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-11-22 11:31:23 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-11-22 11:31:23 +0000 |
| commit | 4a15339e72a7aa24a48d1b6afaf2dff669dea646 (patch) | |
| tree | 90bd35b1f3718e0911de18f14977775f7283460b /cmake/FindDirectX.cmake | |
| parent | b2004626e7f431f74fa80448c7e769ad852d3782 (diff) | |
Try to fix DirectX detection on Mingw.
Diffstat (limited to 'cmake/FindDirectX.cmake')
| -rw-r--r-- | cmake/FindDirectX.cmake | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index f306bd10..7e420bec 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -4,26 +4,26 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") find_path (D3D8_INCLUDE_DIR d3d8.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3d8.h resides") find_path (D3DX8_INCLUDE_DIR d3dx8.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3dx8.h resides") - find_library (D3D8_LIBRARY d3d8.lib + find_library (D3D8_LIBRARY d3d8 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3d8.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3d8 resides") - find_library (D3DX8_LIBRARY d3dx8.lib + find_library (D3DX8_LIBRARY d3dx8 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3dx8.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3dx8 resides") if (D3D8_INCLUDE_DIR AND D3D8_LIBRARY) set (D3D8_FOUND 1) @@ -36,26 +36,26 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") find_path (D3D9_INCLUDE_DIR d3d9.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3d9.h resides") find_path (D3DX9_INCLUDE_DIR d3dx9.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3dx9.h resides") - find_library (D3D9_LIBRARY d3d9.lib + find_library (D3D9_LIBRARY d3d9 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3d9.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3d9 resides") - find_library (D3DX9_LIBRARY d3dx9.lib + find_library (D3DX9_LIBRARY d3dx9 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3dx9.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3dx9 resides") if (D3D9_INCLUDE_DIR AND D3D9_LIBRARY) set (D3D9_FOUND 1) @@ -68,26 +68,26 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") find_path (D3D10_INCLUDE_DIR d3d10.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3d10.h resides") find_path (D3DX10_INCLUDE_DIR d3dx10.h PATHS "$ENV{DXSDK_DIR}/Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Include" DOC "The directory where d3dx10.h resides") - find_library (D3D10_LIBRARY d3d10.lib + find_library (D3D10_LIBRARY d3d10 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3d10.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3d10 resides") - find_library (D3DX10_LIBRARY d3dx10.lib + find_library (D3DX10_LIBRARY d3dx10 PATHS "$ENV{DXSDK_DIR}/Lib/x86" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" - DOC "The directory where d3dx10.lib resides") + "$ENV{ProgramFiles}/Microsoft DirectX SDK/Lib/x86" + DOC "The directory where d3dx10 resides") if (D3D10_INCLUDE_DIR AND D3D10_LIBRARY) set (D3D10_FOUND 1) |