Add server only define to osx device

Benau · Benau · commit 3350d6c106e7 · 2019-07-07T01:12:10.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,7 +129,7 @@ endif()
 
 if(SERVER_ONLY)
     add_definitions(-DSERVER_ONLY)
-    add_definitions(-DNO_IRR_COMPILE_WITH_X11_ -DNO_IRR_COMPILE_WITH_OPENGL_ -DNO_IRR_COMPILE_WITH_OSX_DEVICE_)
+    add_definitions(-DNO_IRR_COMPILE_WITH_X11_ -DNO_IRR_COMPILE_WITH_OPENGL_)
 endif()
 
 if(UNIX OR MINGW)
diff --git a/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
@@ -549,6 +549,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
 
 void CIrrDeviceMacOSX::closeDevice()
 {
+#ifndef SERVER_ONLY
 	if (Window != NULL)
 	{
 		[Window setIsVisible:FALSE];
@@ -586,16 +587,17 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
 			}
 		}
 	}
-
+#endif
 	IsFullscreen = false;
 	IsActive = false;
 	CGLContext = NULL;
 }
 
 bool CIrrDeviceMacOSX::createWindow()
 {
-	CGDisplayErr error;
 	bool result=false;
+#ifndef SERVER_ONLY
+	CGDisplayErr error;
 	CGDirectDisplayID display=CGMainDisplayID();
 	CGLPixelFormatObj pixelFormat;
 	CGRect displayRect;
@@ -905,7 +907,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
 			CGLSetParameter(CGLContext,kCGLCPSwapInterval,&newSwapInterval);
 		}
 	}
-
+#endif
 	return (result);
 }
 
@@ -980,11 +982,13 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
 
 void CIrrDeviceMacOSX::flush()
 {
+#ifndef SERVER_ONLY
 	if (CGLContext != NULL)
 	{
 		glFinish();
 		CGLFlushDrawable(CGLContext);
 	}
+#endif
 }
 
 bool CIrrDeviceMacOSX::run()

Original file line number	Diff line number	Diff line change
`@@ -549,6 +549,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)`
`549`	`549`
`550`	`550`	`void CIrrDeviceMacOSX::closeDevice()`
`551`	`551`	`{`
	`552`	`+#ifndef SERVER_ONLY`
`552`	`553`	`if (Window != NULL)`
`553`	`554`	`{`
`554`	`555`	`[Window setIsVisible:FALSE];`
`@@ -586,16 +587,17 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)`
`586`	`587`	`}`
`587`	`588`	`}`
`588`	`589`	`}`
`589`		`-`
	`590`	`+#endif`
`590`	`591`	`IsFullscreen = false;`
`591`	`592`	`IsActive = false;`
`592`	`593`	`CGLContext = NULL;`
`593`	`594`	`}`
`594`	`595`
`595`	`596`	`bool CIrrDeviceMacOSX::createWindow()`
`596`	`597`	`{`
`597`		`- CGDisplayErr error;`
`598`	`598`	`bool result=false;`
	`599`	`+#ifndef SERVER_ONLY`
	`600`	`+ CGDisplayErr error;`
`599`	`601`	`CGDirectDisplayID display=CGMainDisplayID();`
`600`	`602`	`CGLPixelFormatObj pixelFormat;`
`601`	`603`	`CGRect displayRect;`
`@@ -905,7 +907,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)`
`905`	`907`	`CGLSetParameter(CGLContext,kCGLCPSwapInterval,&newSwapInterval);`
`906`	`908`	`}`
`907`	`909`	`}`
`908`		`-`
	`910`	`+#endif`
`909`	`911`	`return (result);`
`910`	`912`	`}`
`911`	`913`
`@@ -980,11 +982,13 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)`
`980`	`982`
`981`	`983`	`void CIrrDeviceMacOSX::flush()`
`982`	`984`	`{`
	`985`	`+#ifndef SERVER_ONLY`
`983`	`986`	`if (CGLContext != NULL)`
`984`	`987`	`{`
`985`	`988`	`glFinish();`
`986`	`989`	`CGLFlushDrawable(CGLContext);`
`987`	`990`	`}`
	`991`	`+#endif`
`988`	`992`	`}`
`989`	`993`
`990`	`994`	`bool CIrrDeviceMacOSX::run()`