remove the need to have lib/glcomp in the include path

Related to #1785.

diff --git a/cmd/smyrna/topfisheyeview.c b/cmd/smyrna/topfisheyeview.c
index 77698e7737623c1c82943158eabb98e66a5deb72..0b63c0a18fd604cb84fb2979bf248cd6f55657a4 100644 (file)
--- a/cmd/smyrna/topfisheyeview.c
+++ b/cmd/smyrna/topfisheyeview.c
@@ -12,8 +12,6 @@
  *************************************************************************/
 #include "topfisheyeview.h"
 
-//#include "glcomptext.h"
-//#include "glcomptextpng.h"
 #include <math.h>
 #include <common/memory.h>
 #include "viewport.h"

diff --git a/lib/glcomp/glCompTrackBar.h b/lib/glcomp/glCompTrackBar.h
index 60767906942a830d4feb943c7cd8c314305d7035..498699110ab6ac5c2ec2b66d43fe2b33ccb9793c 100644 (file)
--- a/lib/glcomp/glCompTrackBar.h
+++ b/lib/glcomp/glCompTrackBar.h
@@ -13,6 +13,6 @@
 #ifndef GLCOMPTRACKBAR_H
 #define GLCOMPTRACKBAR_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #endif

diff --git a/lib/glcomp/glcompbutton.h b/lib/glcomp/glcompbutton.h
index 82e40ba9e6bf40367911f7886f16655ba202d6f6..220c5028e8250a7e512b88c58e9875237bb9f5f7 100644 (file)
--- a/lib/glcomp/glcompbutton.h
+++ b/lib/glcomp/glcompbutton.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPBUTTON_H
 #define GLCOMPBUTTON_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h
index e79958b9aba38e58aca8061e9c397e30d7e85805..bb312b3f641d754ddd969345d3e00a19e5dc8942 100644 (file)
--- a/lib/glcomp/glcompfont.h
+++ b/lib/glcomp/glcompfont.h
@@ -16,13 +16,13 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
-#include "glpangofont.h"
+#include <glcomp/glpangofont.h>
 typedef float GLfloat;
 #else
 #include <unistd.h>
 #include <GL/gl.h>
 #endif
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #include <GL/glut.h>
 
 #ifdef __cplusplus

diff --git a/lib/glcomp/glcompimage.h b/lib/glcomp/glcompimage.h
index 19b50280fd93b9f725f4011b3fd49eb87c8093a9..0241233f4f8c9e81cddb33e9d4f2d7531971543b 100644 (file)
--- a/lib/glcomp/glcompimage.h
+++ b/lib/glcomp/glcompimage.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPIMAGE_H
 #define GLCOMPIMAGE_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcomplabel.h b/lib/glcomp/glcomplabel.h
index 37961b12566964ae246fce8924649c4adce88f5d..a86897ef9ca43299d67255b4cbc2426ff7010e29 100644 (file)
--- a/lib/glcomp/glcomplabel.h
+++ b/lib/glcomp/glcomplabel.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPLABEL_H
 #define GLCOMPLABEL_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcompmouse.h b/lib/glcomp/glcompmouse.h
index cd15d27607a1516922dcd28a0e87536045171fe9..081d913d0bfec76745b61ed2987eadc41b5a3736 100644 (file)
--- a/lib/glcomp/glcompmouse.h
+++ b/lib/glcomp/glcompmouse.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPMOUSE_H
 #define GLCOMPMOUSE_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcomppanel.h b/lib/glcomp/glcomppanel.h
index a31090a89a99245e8efb546bb21602156efd52ff..21d01af81cdbfd0dbaef1ef018f2f79f0bafc26e 100644 (file)
--- a/lib/glcomp/glcomppanel.h
+++ b/lib/glcomp/glcomppanel.h
@@ -13,7 +13,7 @@
 #ifndef GLCOMPPANEL_H
 #define GLCOMPPANEL_H
 
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcompset.h b/lib/glcomp/glcompset.h
index 399ccdbb58aa95868e07581bcf4b1ff06f953f96..da0a68f6273ba9a6751564310449131b848e20fa 100644 (file)
--- a/lib/glcomp/glcompset.h
+++ b/lib/glcomp/glcompset.h
@@ -17,8 +17,8 @@
 #ifndef GLCOMPSET_H
 #define GLCOMPSET_H
 
-#include "glcompfont.h"
-#include "glcomptextpng.h"
+#include <glcomp/glcompfont.h>
+#include <glcomp/glcomptextpng.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glcomptext.h b/lib/glcomp/glcomptext.h
index a1ecb3bbd50c8d47bc5695e1cda95f973b2e256c..06f6feba0d5e78489feb275806456591d82e437d 100644 (file)
--- a/lib/glcomp/glcomptext.h
+++ b/lib/glcomp/glcomptext.h
@@ -16,13 +16,13 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32
-#include "glpangofont.h"
+#include <glcomp/glpangofont.h>
 typedef float GLfloat;
 #else
 #include <unistd.h>
 #include <GL/gl.h>
 #endif
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 #include <GL/glut.h>
 
 #ifdef __cplusplus

diff --git a/lib/glcomp/glcomptexture.h b/lib/glcomp/glcomptexture.h
index a31288d0e5b93208d99aa28392e4d42a1b89a157..bf40ce1511ec4858d87fe143ab1bd36ecf1f9e67 100644 (file)
--- a/lib/glcomp/glcomptexture.h
+++ b/lib/glcomp/glcomptexture.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/glcomp/glutils.h b/lib/glcomp/glutils.h
index a6d31d7c18b659fa510cc9bee9315f62a970bf5b..fc8250bb34cc24a06ac129acc10ba8a2a40f9cb0 100644 (file)
--- a/lib/glcomp/glutils.h
+++ b/lib/glcomp/glutils.h
@@ -19,7 +19,7 @@
 #endif
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include "glcompdefs.h"
+#include <glcomp/glcompdefs.h>
 
 #ifdef __cplusplus
 extern "C" {