[Bf-blender-cvs] [a5d19a22b7] HMD_viewport: Fixes for HMD support windows build (thanks LazyDodo)

[Joey Ferwerda]

Commit: a5d19a22b7d89c22dc2da3761f15311f3ab85526
Author: Joey Ferwerda
Date:   Mon Mar 6 01:34:32 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rBa5d19a22b7d89c22dc2da3761f15311f3ab85526

Fixes for HMD support windows build (thanks LazyDodo)

===================================================================

M       build_files/cmake/platform/platform_win32_msvc.cmake
M       extern/openhmd/src/drv_htc_vive/packet.c

===================================================================

diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake 
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 45a44596e6..8eedaecc10 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -66,7 +66,7 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} 
/SAFESEH:NO")
 
 list(APPEND PLATFORM_LINKLIBS
        ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32
-       advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp
+       advapi32 shfolder shell32 ole32 oleaut32 uuid psapi Dbghelp setupapi
 )
 
 if(WITH_INPUT_IME)
diff --git a/extern/openhmd/src/drv_htc_vive/packet.c 
b/extern/openhmd/src/drv_htc_vive/packet.c
index c8effb1382..6a0388764c 100644
--- a/extern/openhmd/src/drv_htc_vive/packet.c
+++ b/extern/openhmd/src/drv_htc_vive/packet.c
@@ -1,6 +1,10 @@
 #include "vive.h"
 #include "config.h"
 
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 inline static uint8_t read8(const unsigned char** buffer)
 {
        uint8_t ret = **buffer;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs