Revision: 75547
http://sourceforge.net/p/brlcad/code/75547
Author: starseeker
Date: 2020-04-22 17:13:16 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Wrap osg header inclusions. As of the previous commit wgl tested successfully
on Windows with this new setup - don't know about osgl yet on windows, and it
has the offset error on Linux...
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h
brlcad/branches/dm-fb-merge/src/libdm/osgl/fb_osgl.h
brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
brlcad/branches/dm-fb-merge/src/libdm/osgl/osg_fb_manipulator.h
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-22
16:59:13 UTC (rev 75546)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.cpp 2020-04-22
17:13:16 UTC (rev 75547)
@@ -32,6 +32,21 @@
#include <ctype.h>
#include <math.h>
+#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"
+# pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wfloat-equal"
+# pragma clang diagnostic ignored "-Wdeprecated-copy"
+#endif
+
#include <osg/GraphicsContext>
#include <osgViewer/Viewer>
@@ -41,6 +56,13 @@
# include <osgViewer/api/X11/GraphicsWindowX11>
#endif
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
#include "tcl.h"
#include "tk.h"
#include "tkPlatDecls.h"
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h 2020-04-22
16:59:13 UTC (rev 75546)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/dm-osgl.h 2020-04-22
17:13:16 UTC (rev 75547)
@@ -33,8 +33,31 @@
#ifdef __cplusplus
#include <iostream>
+#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"
+# pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wfloat-equal"
+# pragma clang diagnostic ignored "-Wdeprecated-copy"
+#endif
+
#include <osg/GraphicsContext>
#include <osg/Timer>
+
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
#endif /* __cplusplus */
extern "C" {
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/fb_osgl.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/fb_osgl.h 2020-04-22
16:59:13 UTC (rev 75546)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/fb_osgl.h 2020-04-22
17:13:16 UTC (rev 75547)
@@ -70,6 +70,21 @@
}
#endif
+#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"
+# pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wfloat-equal"
+# pragma clang diagnostic ignored "-Wdeprecated-copy"
+#endif
+
#ifdef __cplusplus
#include <osg/GraphicsContext>
#include <osgViewer/Viewer>
@@ -92,6 +107,15 @@
#include <iostream>
#endif
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
+
+
struct osgl_fb_info {
void *glc;
void *traits;
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-04-22
16:59:13 UTC (rev 75546)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/if_osgl.cpp 2020-04-22
17:13:16 UTC (rev 75547)
@@ -48,7 +48,9 @@
#include "../include/private.h"
}
+extern "C" {
extern struct fb osgl_interface;
+}
#define DIRECT_COLOR_VISUAL_ALLOWED 0
Modified: brlcad/branches/dm-fb-merge/src/libdm/osgl/osg_fb_manipulator.h
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/osgl/osg_fb_manipulator.h
2020-04-22 16:59:13 UTC (rev 75546)
+++ brlcad/branches/dm-fb-merge/src/libdm/osgl/osg_fb_manipulator.h
2020-04-22 17:13:16 UTC (rev 75547)
@@ -20,6 +20,21 @@
#include "common.h"
+#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"
+# pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wfloat-equal"
+# pragma clang diagnostic ignored "-Wdeprecated-copy"
+#endif
+
#include <osgGA/StandardManipulator>
using namespace osg;
@@ -320,6 +335,14 @@
bool _enable, _debug;
};
+
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
/*********************************** End KeyHandler
******************************************/
/*
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
