Makefiles: compile `GLXWorkstation` using OpenGL stx-8.0.0
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 06 Sep 2017 14:38:30 +0200
branchstx-8.0.0
changeset 179 72cd796f3d1c
parent 178 7d15e6580ac0
child 180 5d778c4d94f0
Makefiles: compile `GLXWorkstation` using OpenGL ...rather than old unmaitained VOGL.
makelib/config-i686-pc-linux-gnu.make
makelib/config.make
--- a/makelib/config-i686-pc-linux-gnu.make	Fri Aug 25 19:39:16 2017 +0100
+++ b/makelib/config-i686-pc-linux-gnu.make	Wed Sep 06 14:38:30 2017 +0200
@@ -65,3 +65,4 @@
 LIB_XFT=-l:libXft.so.2 -l:libfontconfig.so.1
 endif
 endif
+
--- a/makelib/config.make	Fri Aug 25 19:39:16 2017 +0100
+++ b/makelib/config.make	Wed Sep 06 14:38:30 2017 +0200
@@ -928,8 +928,11 @@
 #
 # the default here is to use VGL/MESA
 #
-CC_GL_FLAGS=$(CC_VOGL_FLAGS)
-CC_OPENGL_FLAGS=$(CC_MESA_FLAGS)
+# CC_GL_FLAGS=$(CC_VOGL_FLAGS)
+CC_GL_FLAGS=-DOPENGL $(shell pkg-config --cflags gl)
+LIB_GL=$(shell pkg-config --libs gl)
+
+#CC_OPENGL_FLAGS=$(CC_MESA_FLAGS)
 
 # the next one should be defined in a packs file
 # to choose between GL/VGL and OpenGL/MESA
@@ -941,6 +944,7 @@
 #
 
 
+
 # Systems which have true GL/OpenGL, mnay redefine the above
 # for true GL:
 #   CC_GL_FLAGS=-DGLX -I<gl-include-path-if-any>