Removing cmake dir & glew, updating cmakelists

This commit is contained in:
Brad Davis 2014-10-26 14:09:02 -07:00
parent 5b2af89043
commit 98f18bfaac
9 changed files with 7 additions and 39752 deletions

View File

@ -1,4 +0,0 @@
project (LibGLEW C)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
add_library(glew STATIC glew.c include/GL/glew.h)

View File

@ -1,73 +0,0 @@
The OpenGL Extension Wrangler Library
Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
Copyright (C) 2002, Lev Povalahev
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* The name of the author may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
Mesa 3-D graphics library
Version: 7.0
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Copyright (c) 2007 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Materials.
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

18177
3rdParty/glew/glew.c vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,283 +0,0 @@
# - try to find DirectX include dirs and libraries
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if (CMAKE_CL_64)
set (DirectX_ARCHITECTURE x64)
else ()
set (DirectX_ARCHITECTURE x86)
endif ()
# DirectX SDK
find_path (DirectX_ROOT_DIR
Include/d3d9.h
PATHS
"$ENV{DXSDK_DIR}"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (February 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2009)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK"
DOC "DirectX SDK root directory"
)
if (DirectX_ROOT_DIR)
set (DirectX_INC_SEARCH_PATH "${DirectX_ROOT_DIR}/Include")
set (DirectX_LIB_SEARCH_PATH "${DirectX_ROOT_DIR}/Lib/${DirectX_ARCHITECTURE}")
set (DirectX_BIN_SEARCH_PATH "${DirectX_ROOT_DIR}/Utilities/bin/x86")
endif ()
# With VS 2011 and Windows 8 SDK, the DirectX SDK is included as part of
# the Windows SDK.
#
# See also:
# - http://msdn.microsoft.com/en-us/library/windows/desktop/ee663275.aspx
# TODO: Allow using DirectX SDK with VS 2011
#if (DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700)
# find_path (WIN8_SDK_ROOT_DIR
# Include/um/windows.h
# PATHS
# "$ENV{ProgramFiles}/Windows Kits/8.0"
# "$ENV{ProgramFiles(x86)}/Windows Kits/8.0"
# DOC "Windows 8 SDK root directory"
# )
#
# if (WIN8_SDK_ROOT_DIR)
# set (DirectX_INC_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/Include/um" "${WIN8_SDK_ROOT_DIR}/Include/shared")
# set (DirectX_LIB_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/Lib/Win8/um/${DirectX_ARCHITECTURE}")
# set (DirectX_BIN_SEARCH_PATH "${WIN8_SDK_ROOT_DIR}/bin/x86")
# endif ()
#endif ()
find_path (DirectX_D3D_INCLUDE_DIR d3d.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d.h resides")
find_path (DirectX_D3DX_INCLUDE_DIR d3dx.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3dx.h resides")
find_library (DirectX_DDRAW_LIBRARY ddraw
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where ddraw resides")
find_library (DirectX_D3DX_LIBRARY d3dx
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3dx resides")
if (DirectX_D3D_INCLUDE_DIR AND DirectX_DDRAW_LIBRARY)
set (DirectX_D3D_FOUND 1)
if (DirectX_D3DX_INCLUDE_DIR AND DirectX_D3DX_LIBRARY)
set (DirectX_D3DX_FOUND 1)
endif ()
endif ()
find_path (DirectX_D3D8_INCLUDE_DIR d3d8.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d8.h resides")
find_path (DirectX_D3DX8_INCLUDE_DIR d3dx8.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3dx8.h resides")
find_library (DirectX_D3D8_LIBRARY d3d8
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3d8 resides")
find_library (DirectX_D3DX8_LIBRARY d3dx8
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3dx8 resides")
if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3D8_LIBRARY)
set (DirectX_D3D8_FOUND 1)
if (DirectX_D3DX8_INCLUDE_DIR AND DirectX_D3DX8_LIBRARY)
set (DirectX_D3DX8_FOUND 1)
endif ()
endif ()
find_path (DirectX_D3D9_INCLUDE_DIR d3d9.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d9.h resides")
find_path (DirectX_D3DX9_INCLUDE_DIR d3dx9.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3dx9.h resides")
find_library (DirectX_D3D9_LIBRARY d3d9
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3d9 resides")
find_library (DirectX_D3DX9_LIBRARY d3dx9
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3dx9 resides")
if (DirectX_D3D9_INCLUDE_DIR AND DirectX_D3D9_LIBRARY)
set (DirectX_D3D9_FOUND 1)
if (DirectX_D3DX9_INCLUDE_DIR AND DirectX_D3DX9_LIBRARY)
set (DirectX_D3DX9_FOUND 1)
endif ()
endif ()
find_path (DirectX_D3D10_INCLUDE_DIR d3d10.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d10.h resides")
find_path (DirectX_D3DX10_INCLUDE_DIR d3dx10.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3dx10.h resides")
find_library (DirectX_D3D10_LIBRARY d3d10
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3d10 resides")
find_library (DirectX_D3DX10_LIBRARY d3dx10
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3dx10 resides")
if (DirectX_D3D10_INCLUDE_DIR AND DirectX_D3D10_LIBRARY)
set (DirectX_D3D10_FOUND 1)
if (DirectX_D3DX10_INCLUDE_DIR AND DirectX_D3DX10_LIBRARY)
set (DirectX_D3DX10_FOUND 1)
endif ()
endif ()
find_path (DirectX_D3D10_1_INCLUDE_DIR d3d10_1.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d10_1.h resides")
find_library (DirectX_D3D10_1_LIBRARY d3d10_1
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3d10_1 resides")
if (DirectX_D3D10_1_INCLUDE_DIR AND DirectX_D3D10_1_LIBRARY)
set (DirectX_D3D10_1_FOUND 1)
endif ()
find_path (DirectX_D3D11_INCLUDE_DIR d3d11.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d11.h resides")
find_path (DirectX_D3DX11_INCLUDE_DIR d3dx11.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3dx11.h resides")
find_library (DirectX_D3D11_LIBRARY d3d11
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3d11 resides")
find_library (DirectX_D3DX11_LIBRARY d3dx11
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d3dx11 resides")
if (DirectX_D3D11_INCLUDE_DIR AND DirectX_D3D11_LIBRARY)
set (DirectX_D3D11_FOUND 1)
if (DirectX_D3DX11_INCLUDE_DIR AND DirectX_D3DX11_LIBRARY)
set (DirectX_D3DX11_FOUND 1)
endif ()
endif ()
find_path (DirectX_D3D11_1_INCLUDE_DIR d3d11_1.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d3d11_1.h resides")
if (DirectX_D3D11_1_INCLUDE_DIR AND DirectX_D3D11_LIBRARY)
set (DirectX_D3D11_1_FOUND 1)
endif ()
find_program (DirectX_FXC_EXECUTABLE fxc
PATHS ${DirectX_BIN_SEARCH_PATH}
DOC "Path to fxc.exe executable.")
find_path (DirectX_D2D1_INCLUDE_DIR d2d1.h
PATHS ${DirectX_INC_SEARCH_PATH}
DOC "The directory where d2d1.h resides")
find_library (DirectX_D2D1_LIBRARY d2d1
PATHS ${DirectX_LIB_SEARCH_PATH}
DOC "The directory where d2d1 resides")
if (DirectX_D2D1_INCLUDE_DIR AND DirectX_D2D1_LIBRARY)
set (DirectX_D2D1_FOUND 1)
endif (DirectX_D2D1_INCLUDE_DIR AND DirectX_D2D1_LIBRARY)
mark_as_advanced (
DirectX_D3D_INCLUDE_DIR
DirectX_D3D_INCLUDE_DIR
DirectX_DDRAW_LIBRARY
DirectX_DDRAW_LIBRARY
DirectX_D3DX_INCLUDE_DIR
DirectX_D3DX_INCLUDE_DIR
DirectX_D3DX_LIBRARY
DirectX_D3DX_LIBRARY
DirectX_D3D8_INCLUDE_DIR
DirectX_D3D8_INCLUDE_DIR
DirectX_D3D8_LIBRARY
DirectX_D3D8_LIBRARY
DirectX_D3DX8_INCLUDE_DIR
DirectX_D3DX8_INCLUDE_DIR
DirectX_D3DX8_LIBRARY
DirectX_D3DX8_LIBRARY
DirectX_D3D9_INCLUDE_DIR
DirectX_D3D9_LIBRARY
DirectX_D3DX9_INCLUDE_DIR
DirectX_D3DX9_LIBRARY
DirectX_D3D10_INCLUDE_DIR
DirectX_D3D10_LIBRARY
DirectX_D3DX10_INCLUDE_DIR
DirectX_D3DX10_LIBRARY
DirectX_D3D10_1_INCLUDE_DIR
DirectX_D3D10_1_LIBRARY
DirectX_D3D11_INCLUDE_DIR
DirectX_D3D11_LIBRARY
DirectX_D3DX11_INCLUDE_DIR
DirectX_D3DX11_LIBRARY
DirectX_D3D11_1_INCLUDE_DIR
DirectX_D2D1_INCLUDE_DIR
DirectX_D2D1_LIBRARY
)
endif ()
mark_as_advanced (
DirectX_D3D_FOUND
DirectX_D3DX_FOUND
DirectX_D3D8_FOUND
DirectX_D3DX8_FOUND
DirectX_D3D9_FOUND
DirectX_D3DX9_FOUND
DirectX_D3D10_FOUND
DirectX_D3DX10_FOUND
DirectX_D3D10_1_FOUND
DirectX_D3D11_FOUND
DirectX_D3DX11_FOUND
DirectX_D3D11_1_FOUND
DirectX_D2D1_FOUND
)

View File

@ -49,26 +49,17 @@ set_target_properties(OculusVR PROPERTIES FOLDER "Oculus")
option(OCULUS_BUILD_SAMPLES "Build Oculus demos" TRUE)
if(OCULUS_BUILD_SAMPLES)
# Make sure to set up the OVR include paths
include_directories(3rdParty/glew/include)
include_directories(${OculusVR_SOURCE_DIR}/Include)
include_directories(${OculusVR_SOURCE_DIR}/Src)
include_directories(${OculusVR_SOURCE_DIR}/Src/Kernel)
include_directories(${OculusVR_SOURCE_DIR}/Src/Util)
include_directories(Bindings/C/Include)
# Cross platform window creation
# add_subdirectory(3rdParty/glfw)
# include_directories(${CMAKE_SOURCE_DIR}/3rdParty/glfw/include)
# Cross platform access to shader functionality
# include_directories(${CMAKE_SOURCE_DIR}/3rdParty/glext)
# Used by the sample code to read the tuscany resources
add_subdirectory(3rdParty/TinyXml)
set_target_properties(TinyXML2 PROPERTIES FOLDER "3rdParty")
include_directories(3rdParty/TinyXml)
# Make sure to set up the OVR include paths
include_directories(${OculusVR_SOURCE_DIR}/Include)
include_directories(${OculusVR_SOURCE_DIR}/Src)
include_directories(${OculusVR_SOURCE_DIR}/Src/Kernel)
include_directories(${OculusVR_SOURCE_DIR}/Src/Util)
add_subdirectory (Samples/CommonSrc )
set_target_properties(CommonSrc PROPERTIES FOLDER "Samples")

View File

@ -90,6 +90,6 @@ else()
endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOVR_BUILD_DEBUG")
add_library(OculusVR SHARED ${SOURCE_FILES} ${PLATFORM_SOURCE_FILES})
add_library(OculusVR ${SOURCE_FILES} ${PLATFORM_SOURCE_FILES})
target_link_libraries(OculusVR ${EXTRA_LIBS})
set(OVR_LIBRARIES ${EXTRA_LIBS} CACHE STRING "Dependencies of OculusVR")