From 177c935b9d82114bd309d1ca0a8b79c60fc9bf30 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 16 Nov 2014 19:14:51 +0000
Subject: [PATCH] Move 3d/clipper.cpp to SDL-only build

---
 SConstruct           | 2 +-
 common/3d/clipper.h  | 7 ++++++-
 common/3d/globvars.h | 1 -
 common/3d/setup.cpp  | 8 ++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index a4c2b0b07..464b0e742 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1351,7 +1351,6 @@ class DXXArchive(DXXCommon):
 '2d/rect.cpp',
 '2d/rle.cpp',
 '2d/scalec.cpp',
-'3d/clipper.cpp',
 '3d/draw.cpp',
 '3d/globvars.cpp',
 '3d/instance.cpp',
@@ -1399,6 +1398,7 @@ class DXXArchive(DXXCommon):
 ])
 	# for non-ogl
 	objects_arch_sdl = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
+'3d/clipper.cpp',
 'texmap/tmapflat.cpp'
 ]
 ])
diff --git a/common/3d/clipper.h b/common/3d/clipper.h
index f2392fb5a..b875185c9 100644
--- a/common/3d/clipper.h
+++ b/common/3d/clipper.h
@@ -20,13 +20,18 @@
 struct g3s_codes;
 struct g3s_point;
 
+#ifdef OGL
+static inline void init_free_points() {}
+#else
 #include "compiler-array.h"
 struct polygon_clip_points : array<g3s_point *, MAX_POINTS_IN_POLY> {};
 
+extern int free_point_num;
+void init_free_points();
 extern void free_temp_point(g3s_point *p);
 const polygon_clip_points &clip_polygon(polygon_clip_points &src,polygon_clip_points &dest,int *nv,g3s_codes *cc);
-extern void init_free_points(void);
 void clip_line(g3s_point *&p0,g3s_point *&p1,ubyte codes_or);
+#endif
 
 #endif
 
diff --git a/common/3d/globvars.h b/common/3d/globvars.h
index 242c11902..9d0f1073f 100644
--- a/common/3d/globvars.h
+++ b/common/3d/globvars.h
@@ -29,7 +29,6 @@ extern double fCanv_w2, fCanv_h2;
 #endif
 
 extern vms_vector Window_scale;
-extern int free_point_num;
 
 extern fix View_zoom;
 extern vms_vector View_position,Matrix_scale;
diff --git a/common/3d/setup.cpp b/common/3d/setup.cpp
index 33ef66be6..dd92c4273 100644
--- a/common/3d/setup.cpp
+++ b/common/3d/setup.cpp
@@ -68,11 +68,7 @@ void g3_end_frame(void)
 {
 #ifdef OGL
 	ogl_end_frame();
-#endif
-
-//	Assert(free_point_num==0);
+#else
 	free_point_num = 0;
-
+#endif
 }
-
-