xrPhysics: fix linkage internal virtal destructors on Windows

OpenXRay · Jun 6, 2018 · 6ca8238 · 6ca8238
1 parent b9274fc
commit 6ca8238
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/src/xrPhysics/IColisiondamageInfo.h b/src/xrPhysics/IColisiondamageInfo.h
@@ -18,6 +18,10 @@ class ICollisionDamageInfo
     virtual bool GetAndResetInitiated() = 0;
 
 protected:
+#if defined(WINDOWS)
+    virtual ~ICollisionDamageInfo() = 0 {}
+#elif defined(LINUX)
     virtual ~ICollisionDamageInfo() = 0;
+#endif
 };
 #endif
diff --git a/src/xrPhysics/IElevatorState.h b/src/xrPhysics/IElevatorState.h
@@ -19,5 +19,9 @@ class IElevatorState
     virtual void NetRelcase(IPhysicsShellHolder* O) = 0;
 
 protected:
+#if defined(WINDOWS)
+    virtual ~IElevatorState() = 0 {}
+#elif defined(LINUX)
     virtual ~IElevatorState() = 0;
+#endif
 };
diff --git a/src/xrPhysics/IPHCapture.h b/src/xrPhysics/IPHCapture.h
@@ -8,7 +8,11 @@ class IPHCapture
     virtual void Release() = 0;
 
 protected:
+#if defined(WINDOWS)
+    virtual ~IPHCapture() = 0 {}
+#elif defined(LINUX)
     virtual ~IPHCapture() = 0;
+#endif
 };
 class CPHCharacter;
 struct NearestToPointCallback;

diff --git a/src/xrPhysics/IPHStaticGeomShell.h b/src/xrPhysics/IPHStaticGeomShell.h
@@ -3,7 +3,12 @@
 class IPHStaticGeomShell
 {
 protected:
+#if defined(WINDOWS)
+    virtual ~IPHStaticGeomShell() = 0 {}
+#elif defined(LINUX)
     virtual ~IPHStaticGeomShell() = 0;
+#endif
+
     //	virtual void						set_ObjectContactCallback	(ObjectContactCallbackFun* callback);
 };
 

diff --git a/src/xrPhysics/iphysics_scripted.h b/src/xrPhysics/iphysics_scripted.h
@@ -32,8 +32,12 @@ class iphysics_scripted_class
 #ifdef _EDITOR
     virtual ~iphysics_scripted_class() {}
 #else
+#if defined(WINDOWS)
+    virtual ~iphysics_scripted_class() = 0 {}
+#elif defined(LINUX)
     virtual ~iphysics_scripted_class() = 0;
 #endif
+#endif
 };
 
 namespace non_copy