jherico/OculusSDK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing merge errors, again

Browse Source
This commit is contained in:
Brad Davis 2014-12-04 20:57:49 -08:00
parent 2fee38303c
commit 3a40e614b3
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -26,7 +26,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-std=gnu++0x)
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
@ -37,17 +36,12 @@ if(WIN32)
add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DUNICODE -D_UNICODE)
elseif(APPLE) elseif(APPLE)
else() else()
add_subdirectory(3rdParty/EDID)
set_target_properties(edid PROPERTIES FOLDER "3rdParty")
endif() endif()
# The primary SDK artifact, a static library for Oculus access # The primary SDK artifact, a static library for Oculus access
add_subdirectory(LibOVR) add_subdirectory(LibOVR)
set_target_properties(OculusVR PROPERTIES FOLDER "Oculus") set_target_properties(OculusVR PROPERTIES FOLDER "Oculus")
add_subdirectory(Bindings/C)
set_target_properties(OVR_C PROPERTIES FOLDER "Oculus")
############################################################################### ###############################################################################
# #
# Sample code support # Sample code support
@ -55,21 +49,16 @@ set_target_properties(OVR_C PROPERTIES FOLDER "Oculus")
option(OCULUS_BUILD_SAMPLES "Build Oculus demos" TRUE) option(OCULUS_BUILD_SAMPLES "Build Oculus demos" TRUE)
if(OCULUS_BUILD_SAMPLES) if(OCULUS_BUILD_SAMPLES)
# 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)
include_directories(Bindings/C/Include)
add_subdirectory (Samples/OculusRoomTiny )
set_target_properties(OculusRoomTiny PROPERTIES FOLDER "Samples")
# Used by the sample code to read the tuscany resources # Used by the sample code to read the tuscany resources
add_subdirectory(3rdParty/TinyXml) add_subdirectory(3rdParty/TinyXml)
set_target_properties(TinyXML2 PROPERTIES FOLDER "3rdParty") set_target_properties(TinyXML2 PROPERTIES FOLDER "3rdParty")
include_directories(3rdParty/TinyXml) 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 ) add_subdirectory (Samples/CommonSrc )
set_target_properties(CommonSrc PROPERTIES FOLDER "Samples") set_target_properties(CommonSrc PROPERTIES FOLDER "Samples")

2
LibOVR/CMakeLists.txt
View File

@ -7,7 +7,7 @@ file(GLOB_RECURSE SOURCE_FILES Src/*.cpp Src/*.h Include/*.h)
file(GLOB_RECURSE WIN32_FILES Src/OVR_Win32_*.cpp Src/OVR_Win32_*.h Src/Kernel/OVR_ThreadsWinAPI.cpp *D3D*.cpp) file(GLOB_RECURSE WIN32_FILES Src/OVR_Win32_*.cpp Src/OVR_Win32_*.h Src/Kernel/OVR_ThreadsWinAPI.cpp *D3D*.cpp)
file(GLOB_RECURSE D3DX_FILES Src/CAPI_D3D1X*.cpp Src/OVR_D3D1X*.h) file(GLOB_RECURSE D3DX_FILES Src/CAPI_D3D1X*.cpp Src/OVR_D3D1X*.h)
file(GLOB_RECURSE OSX_FILES Src/OVR_OSX_*.cpp Src/OVR_OSX_*.h Src/*.mm) file(GLOB_RECURSE OSX_FILES Src/OVR_OSX_*.cpp Src/OVR_OSX_*.h Src/*.mm Src/*OSX.c)
file(GLOB_RECURSE LINUX_FILES Src/OVR_Linux_*.cpp Src/OVR_Linux_*.h) file(GLOB_RECURSE LINUX_FILES Src/OVR_Linux_*.cpp Src/OVR_Linux_*.h)
file(GLOB_RECURSE UNIX_FILES Src/OVR_Unix_*.cpp Src/OVR_Unix_*.h Src/Kernel/OVR_ThreadsPthread.cpp) file(GLOB_RECURSE UNIX_FILES Src/OVR_Unix_*.cpp Src/OVR_Unix_*.h Src/Kernel/OVR_ThreadsPthread.cpp)