fix: PhoneVR for new ALVR C API (v22) (#306)

* move json submodule to common/libs * Update for new API Changes in ALVR v22 * Update PhoneVR.vcxproj * lint fix * lint fixes * submodule is tagged to recent master branch of ALVR - Will not release this way but have to do for testing
PhoneVR-Developers · Mar 31, 2024 · 4a5906c · 4a5906c
1 parent 70fcdee
commit 4a5906c
Show file tree

Hide file tree

Showing 8 changed files with 258 additions and 192 deletions.
diff --git a/.clang-format b/.clang-format
@@ -12,7 +12,7 @@ AllowShortIfStatementsOnASingleLine: false
 AlignTrailingComments: true
 SpacesBeforeTrailingComments: 3
 # change the next line to All for Alistair's textbook style
-AlwaysBreakAfterReturnType: TopLevelDefinitions
+# AlwaysBreakAfterReturnType: TopLevelDefinitions
 #  #define SHORT_NAME       42
 #  #define LONGER_NAME      0x007f   # does nice spacing for macros
 AlignConsecutiveMacros: Consecutive

diff --git a/.gitmodules b/.gitmodules
@@ -2,7 +2,7 @@
 	path = code/mobile/android/PhoneVR/ALVR
 	url = https://github.com/PhoneVR-Developers/ALVR-phonevr
 [submodule "code/windows/libs/json"]
-	path = code/windows/libs/json
+	path = code/common/libs/json
 	url = https://github.com/nlohmann/json
 [submodule "code/common/libs/eigen"]
 	path = code/common/libs/eigen

diff --git a/code/windows/libs/json → code/common/libs/json b/code/windows/libs/json → code/common/libs/json
diff --git a/code/mobile/android/PhoneVR/ALVR b/code/mobile/android/PhoneVR/ALVR
diff --git a/code/mobile/android/PhoneVR/app/CMakeLists.txt b/code/mobile/android/PhoneVR/app/CMakeLists.txt
@@ -12,6 +12,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 # find all src files
 file(GLOB_RECURSE  MY_SRC
     ../../../../common/libs/ifaddrs/*.c
+    ../../../../common/libs/json/single_include/*.hpp
     ../../../../common/src/*.cpp
     ../../../mobile-common/*.cpp
 )
@@ -31,6 +32,7 @@ target_include_directories(native-lib
     PUBLIC ../../../../common/libs/asio/asio/include
     PUBLIC ../../../../common/libs/eigen/Eigen
     PUBLIC ../../../../common/libs/ifaddrs
+    PUBLIC ../../../../common/libs/json/single_include/
 
     # my headers
     PUBLIC ../../../../common/src

diff --git a/code/mobile/android/PhoneVR/app/src/main/cpp/alvr_main.cpp b/code/mobile/android/PhoneVR/app/src/main/cpp/alvr_main.cpp
diff --git a/code/windows/PhoneVR/PhoneVR/PhoneVR.vcxproj b/code/windows/PhoneVR/PhoneVR/PhoneVR.vcxproj
@@ -94,7 +94,7 @@
       <WarningLevel>Level1</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0601;WIN32;_DEBUG;_WINDOWS;_USRDLL;PHONEVR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\..\common\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -112,7 +112,7 @@
       </PrecompiledHeader>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;_USRDLL;PHONEVR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;$(SolutionDir)\..\..\common\src\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\..\common\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;$(SolutionDir)\..\..\common\src\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -135,7 +135,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0601;WIN32;NDEBUG;_WINDOWS;_USRDLL;PHONEVR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\..\common\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
@@ -157,7 +157,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WIN32_WINNT=0x0601;NDEBUG;_WINDOWS;_USRDLL;PHONEVR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\$(ProjectName);$(SolutionDir)\..\..\common\src;$(SolutionDir)\..\..\common\libs\json\include\;$(SolutionDir)\..\libs\x264\include;$(SolutionDir)\..\..\common\libs\asio\asio\include\;$(SolutionDir)\..\..\common\libs\eigen\Eigen;$(SolutionDir)\..\..\common\src\Utils;</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>

diff --git a/code/windows/PhoneVR/PhoneVR/openvr_driver.h b/code/windows/PhoneVR/PhoneVR/openvr_driver.h
@@ -1177,7 +1177,7 @@ namespace vr {
 
 #endif   // _INCLUDE_VRTYPES_H
 
-         // vrannotation.h
+// vrannotation.h
 #ifdef API_GEN
 #define VR_CLANG_ATTR(ATTR) __attribute__((annotate(ATTR)))
 #else