xrRender: fix build r1-r4 renders

eagleivg · q4a · commit d9afc98d2dba · 2018-09-29T20:22:48.000+03:00
diff --git a/src/Layers/xrRender/SkeletonX.h b/src/Layers/xrRender/SkeletonX.h
@@ -165,7 +165,7 @@ BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, con
     VERIFY(!"Not implemented");
     return FALSE;
 }
-#elif USE_DX10
+#else USE_DX10
 template <typename T>
 BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, const Fvector& S, const Fvector& D,
     Fvisual* V, u16* indices, CBoneData::FacesVec& faces)
diff --git a/src/Layers/xrRender/tss_def.h b/src/Layers/xrRender/tss_def.h
@@ -3,7 +3,9 @@
 
 #pragma once
 
+#if defined(USE_OGL)
 #include "../xrRenderGL/glState.h"
+#endif
 
 class SimulatorStates
 {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, con`
`165`	`165`	`VERIFY(!"Not implemented");`
`166`	`166`	`return FALSE;`
`167`	`167`	`}`
`168`		`-#elif USE_DX10`
	`168`	`+#else USE_DX10`
`169`	`169`	`template <typename T>`
`170`	`170`	`BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, const Fvector& S, const Fvector& D,`
`171`	`171`	`Fvisual* V, u16* indices, CBoneData::FacesVec& faces)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@`
`3`	`3`
`4`	`4`	`#pragma once`
`5`	`5`
	`6`	`+#if defined(USE_OGL)`
`6`	`7`	`#include "../xrRenderGL/glState.h"`
	`8`	`+#endif`
`7`	`9`
`8`	`10`	`class SimulatorStates`
`9`	`11`	`{`