Revision: 76669
http://sourceforge.net/p/brlcad/code/76669
Author: starseeker
Date: 2020-08-06 16:49:39 +0000 (Thu, 06 Aug 2020)
Log Message:
-----------
Key off of OpenGL. TODO: this feature belongs at a lower level...
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/tclcad_obj.c
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2020-08-06 16:34:01 UTC (rev
76668)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2020-08-06 16:49:39 UTC (rev
76669)
@@ -70,14 +70,12 @@
#include "icv/crop.h"
#include "dm.h"
-#if defined(DM_OGL) || defined(DM_WGL)
-# if defined(DM_WGL)
-# include <tkwinport.h>
-# endif
-# ifdef HAVE_GL_GL_H
-# include <GL/gl.h>
-# endif
+#if defined(HAVE_WINDOWS_H)
+# include <tkwinport.h>
#endif
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#endif
/* For the moment call internal libged functions - a cleaner
* solution will be needed eventually */
@@ -375,7 +373,7 @@
ged_func_ptr func,
const char *usage,
int maxargs);
-#if defined(DM_OGL) || defined(DM_WGL)
+#ifdef HAVE_GL_GL_H
HIDDEN int to_pix(struct ged *gedp,
int argc,
const char *argv[],
@@ -910,7 +908,7 @@
{"oscale_mode", "obj x y", TO_UNLIMITED, to_oscale_mode,
GED_FUNC_PTR_NULL},
{"otranslate_mode", "obj x y", TO_UNLIMITED, to_otranslate_mode,
GED_FUNC_PTR_NULL},
{"paint_rect_area", "vname", TO_UNLIMITED, to_paint_rect_area,
GED_FUNC_PTR_NULL},
-#if defined(DM_OGL) || defined(DM_WGL)
+#ifdef HAVE_GL_GL_H
{"pix", "file", TO_UNLIMITED, to_pix, GED_FUNC_PTR_NULL},
{"png", "file", TO_UNLIMITED, to_png, GED_FUNC_PTR_NULL},
#endif
@@ -4745,7 +4743,7 @@
}
-#if defined(DM_OGL) || defined(DM_WGL)
+#ifdef HAVE_GL_GL_H
HIDDEN int
to_pix(struct ged *gedp,
int argc,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
