Merge branch 'kasen/core' into v0860-kasen-release+freshstart

This commit is contained in:
Kasen IO 2019-12-01 22:08:45 -05:00
commit 94df2c304b

View file

@ -12,14 +12,14 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
set(CMAKE_BUILD_TYPE "Release")
# client-side plugins
if (NOT SERVER_ONLY AND NOT ANDROID)
#set(DIR "oculus")
#add_subdirectory(${DIR})
set(DIR "oculus")
add_subdirectory(${DIR})
set(DIR "hifiSdl2")
add_subdirectory(${DIR})
set(DIR "openvr")
add_subdirectory(${DIR})
#set(DIR "oculusLegacy")
#add_subdirectory(${DIR})
set(DIR "oculusLegacy")
add_subdirectory(${DIR})
if (USE_SIXENSE)
set(DIR "hifiSixense")