Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix controllers/shared compile for android interface port

Browse source
This commit is contained in:
Stephen Birarda 2016-08-31 16:34:31 -07:00
parent 47f15f6ad8
commit 85ba0f36cf
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -245,6 +245,7 @@ endif()
if (ANDROID OR DESKTOP_GVR) if (ANDROID OR DESKTOP_GVR)
add_subdirectory(interface) add_subdirectory(interface)
add_subdirectory(gvr-interface) add_subdirectory(gvr-interface)
add_subdirectory(plugins)
endif () endif ()
if (DEFINED ENV{HIFI_MEMORY_DEBUGGING}) if (DEFINED ENV{HIFI_MEMORY_DEBUGGING})

6
interface/CMakeLists.txt
View file

@ -168,7 +168,7 @@ if (WIN32)
endif() endif()
if (NOT ANDROID) if (NOT ANDROID)
set(${STEAM_WRAPPER} steamworks-wrapper) set(${NON_ANDROID_LIBRARIES} controllers ui-plugins display-plugins input-plugins steamworks-wrapper)
endif () endif ()
# link required hifi libraries # link required hifi libraries
@ -177,8 +177,8 @@ link_hifi_libraries(
recording fbx networking model-networking entities avatars recording fbx networking model-networking entities avatars
audio audio-client animation script-engine physics audio audio-client animation script-engine physics
render-utils entities-renderer ui auto-updater render-utils entities-renderer ui auto-updater
controllers plugins ui-plugins display-plugins input-plugins controllers plugins
${STEAM_WRAPPER} ${NON_ANDROID_LIBRARIES}
) )
# include the binary directory of render-utils for shader includes # include the binary directory of render-utils for shader includes

3
libraries/controllers/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(TARGET_NAME controllers) set(TARGET_NAME controllers)
# set a default root dir for each of our optional externals if it was not passed # set a default root dir for each of our optional externals if it was not passed
setup_hifi_library(Script) setup_hifi_library(Script Qml)
# use setup_hifi_library macro to setup our project and link appropriate Qt modules # use setup_hifi_library macro to setup our project and link appropriate Qt modules
link_hifi_libraries(shared) link_hifi_libraries(shared)
@ -11,4 +11,3 @@ GroupSources("src/controllers")
add_dependency_external_projects(glm) add_dependency_external_projects(glm)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})

2
libraries/plugins/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(TARGET_NAME plugins) set(TARGET_NAME plugins)
setup_hifi_library(OpenGL) setup_hifi_library(OpenGL)
link_hifi_libraries(shared) link_hifi_libraries(shared networking)
include_hifi_library_headers(gpu) include_hifi_library_headers(gpu)

4
libraries/shared/src/shared/Bilateral.h
View file

@ -28,7 +28,7 @@ namespace bilateral {
case Side::Right: case Side::Right:
return 0x02; return 0x02;
} }
return UINT8_MAX; return std::numeric_limits<uint8_t>::max();
} }
inline uint8_t index(Side side) { inline uint8_t index(Side side) {
@ -38,7 +38,7 @@ namespace bilateral {
case Side::Right: case Side::Right:
return 1; return 1;
} }
return UINT8_MAX; return std::numeric_limits<uint8_t>::max();
} }
template <typename F> template <typename F>