From be0376665a80d0d8f4777bed34c2a39d11fc38ab Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Fri, 24 Apr 2020 12:18:37 +0200
Subject: Allow tqtinterface to build without OpenGL support. This should close
 bug 2645. Some cosmetics here and there. Adapted for r14.0.x branch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gregory guy <gregory-tde@laposte.net>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit db81506ab39530bfee455d14054040b4f43cd945)
---
 qtinterface/CMakeLists.txt          | 1 +
 qtinterface/interface_qt3/tqgl.cpp  | 6 ++++++
 qtinterface/interface_tqt3/tqgl.cpp | 6 ++++++
 3 files changed, 13 insertions(+)

(limited to 'qtinterface')

diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index 454c13a..f43fc0b 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
   ${QT_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}
   ${CMAKE_CURRENT_SOURCE_DIR}/${IFACE}/private
+  ${CMAKE_BINARY_DIR}
 )
 
 link_directories(
diff --git a/qtinterface/interface_qt3/tqgl.cpp b/qtinterface/interface_qt3/tqgl.cpp
index 66f69cc..e165f5c 100644
--- a/qtinterface/interface_qt3/tqgl.cpp
+++ b/qtinterface/interface_qt3/tqgl.cpp
@@ -18,6 +18,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.
 
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <tqt.h>
+
+#ifdef HAVE_OPENGL
 #include <tqgl.h>
+#endif
diff --git a/qtinterface/interface_tqt3/tqgl.cpp b/qtinterface/interface_tqt3/tqgl.cpp
index 33c8bb6..3ec7177 100644
--- a/qtinterface/interface_tqt3/tqgl.cpp
+++ b/qtinterface/interface_tqt3/tqgl.cpp
@@ -18,6 +18,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.
 
 */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <tqt.h>
+
+#ifdef HAVE_OPENGL
 #include <ntqgl.h>
+#endif
-- 
cgit v1.2.1