[Bf-blender-cvs] [12ee739] HMD_viewport: Fixed warnings for compiling OpenHMD, added static flag for windows compile

TheOnlyJoey noreply at git.blender.org
Thu Mar 17 20:06:34 CET 2016


Commit: 12ee739cbc1c157cc79712b2247d38dd71ed54ac
Author: TheOnlyJoey
Date:   Thu Mar 17 20:06:05 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB12ee739cbc1c157cc79712b2247d38dd71ed54ac

Fixed warnings for compiling OpenHMD, added static flag for windows compile

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

M	extern/openhmd/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	intern/ghost/intern/GHOST_System.cpp

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

diff --git a/extern/openhmd/CMakeLists.txt b/extern/openhmd/CMakeLists.txt
index e94206e..96ab11f 100644
--- a/extern/openhmd/CMakeLists.txt
+++ b/extern/openhmd/CMakeLists.txt
@@ -47,4 +47,13 @@ if (OPENHMD_DRIVER_ANDROID)
 	add_definitions(-DDRIVER_ANDROID)
 endif(OPENHMD_DRIVER_ANDROID)
 
-blender_add_lib(extern_openhmd "${openhmd_source_files}" "${openhmd_source_files}" "${LIBS}")
+set(INC
+	.
+	src
+)
+
+set(INC_SYS
+
+)
+
+blender_add_lib(extern_openhmd "${openhmd_source_files}" "${INC}" "${INC_SYS}")
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 69ae1e3..534a952 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -116,6 +116,10 @@ endif()
 if(WITH_OPENHMD)
 	add_definitions(-DWITH_OPENHMD)
 
+	if (WIN32)
+		add_definitions(-DOHMD_STATIC)
+	endif(WIN32)
+
 	list(APPEND INC
 		../../extern/openhmd
 	)
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp
index 24f61b6..9cd25b9 100644
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@ -217,9 +217,11 @@ bool GHOST_System::getFullScreen(void)
 bool GHOST_System::processEvents(bool waitForEvent)
 {
 	bool anyProcessed = false;
+#ifdef WITH_OPENHMD
 	if (m_openHMDManager->processEvents()) {
 			anyProcessed = true;
 	}
+#endif
 
 	return anyProcessed;
 }




More information about the Bf-blender-cvs mailing list