Revision: 75337
http://sourceforge.net/p/brlcad/code/75337
Author: starseeker
Date: 2020-04-10 17:02:51 +0000 (Fri, 10 Apr 2020)
Log Message:
-----------
Fixes for osgl compilation
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-osgl.cpp
brlcad/trunk/src/libdm/dm-osgl.h
Modified: brlcad/trunk/src/libdm/dm-osgl.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-10 17:02:12 UTC (rev 75336)
+++ brlcad/trunk/src/libdm/dm-osgl.cpp 2020-04-10 17:02:51 UTC (rev 75337)
@@ -382,7 +382,7 @@
*
*/
extern "C" struct dm_internal *
-osgl_open(Tcl_Interp *vinterp, int argc, char **argv)
+osgl_open(void *vinterp, int argc, char **argv)
{
static int count = 0;
GLfloat backgnd[4];
Modified: brlcad/trunk/src/libdm/dm-osgl.h
===================================================================
--- brlcad/trunk/src/libdm/dm-osgl.h 2020-04-10 17:02:12 UTC (rev 75336)
+++ brlcad/trunk/src/libdm/dm-osgl.h 2020-04-10 17:02:51 UTC (rev 75337)
@@ -42,10 +42,29 @@
extern "C" {
/* For portable text in OpenGL, use fontstash */
#define FONTSTASH_IMPLEMENTATION
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic push
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic push
+#endif
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic ignored "-Wfloat-equal"
#include "./fontstash/fontstash.h"
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wfloat-equal"
+#endif
+#define GLFONTSTASH_IMPLEMENTATION
-#define GLFONTSTASH_IMPLEMENTATION
#include "./fontstash/glfontstash.h"
+
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
}
#define CMAP_BASE 40
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
