diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-04-24 12:18:37 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-04-29 14:28:46 +0200 |
| commit | be0376665a80d0d8f4777bed34c2a39d11fc38ab (patch) | |
| tree | 727d657b20b5d5fa6fc8a998bcbe500eaf9ccf38 /qtinterface | |
| parent | afc170a48eaeb698810bc133e1514b7c6c8b8c50 (diff) | |
| download | tqtinterface-be0376665a80d0d8f4777bed34c2a39d11fc38ab.tar.gz tqtinterface-be0376665a80d0d8f4777bed34c2a39d11fc38ab.zip | |
Allow tqtinterface to build without OpenGL support.
This should close bug 2645.
Some cosmetics here and there.
Adapted for r14.0.x branch.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit db81506ab39530bfee455d14054040b4f43cd945)
Diffstat (limited to 'qtinterface')
| -rw-r--r-- | qtinterface/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | qtinterface/interface_qt3/tqgl.cpp | 6 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqgl.cpp | 6 |
3 files changed, 13 insertions, 0 deletions
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 |