# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1504689189 -7200
# Node ID 7cd36eb4b09c6266d7cd4e4840099f152306a351
# Parent  25149dfd68e0f0d4f0e2ca4d588cc43cad912f68
X11: fixed `GLXWorkstation` to compile with OpenGL

diff -r 25149dfd68e0 -r 7cd36eb4b09c GLXWorkstation.st
--- a/GLXWorkstation.st	Wed Sep 06 10:04:18 2017 +0200
+++ b/GLXWorkstation.st	Wed Sep 06 11:13:09 2017 +0200
@@ -107,15 +107,20 @@
 # define DYNAMICALLY_LOADABLE
 #endif
 
+#ifdef __linux__
+# include <signal.h>
+#endif
+
 #ifndef OPENGL
 # ifdef MESA
 #  define OPENGL
 # endif
 #endif
 
-#ifdef OPENGL   /* SGI or other's OPENGL library */
+#ifdef OPENGL   /* SGI or other OPENGL library */
 
 # include "GL/gl.h"
+# include "GL/glx.h"
 
 # ifdef MESA    /* GNU MESA openGL simulation */
 #  include "GL/xmesa.h"
@@ -129,7 +134,7 @@
 
 #else
 
-# ifdef GLX     /* SGI's native GL library */
+# ifdef GLX     /* SGI native GL library */
 #  include <gl/glws.h>
 #  include <gl/sphere.h>
 # else          /* VOGL GL subset simulation */
@@ -163,7 +168,7 @@
 # define LEAVEGLX     __END_PROTECT_REGISTERS__
 
 /*
- * stupid again - from now on, we need ST/X's String again
+ * stupid again - from now on, we need ST/Xs String again
  */
 #undef String
 #ifdef __DEF_String
diff -r 25149dfd68e0 -r 7cd36eb4b09c Make.proto
--- a/Make.proto	Wed Sep 06 10:04:18 2017 +0200
+++ b/Make.proto	Wed Sep 06 11:13:09 2017 +0200
@@ -50,7 +50,7 @@
 # ********** OPTIONAL: MODIFY the next line ***
 # additional C-libraries that should be pre-linked with the class-objects
 LD_OBJ_LIBS=
-LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
+LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB) 
 
 
 # ********** OPTIONAL: MODIFY the next line ***
@@ -63,15 +63,8 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs:: glLib
-
-
-postMake:: $(LIBVIEW_EXTRA_TARGETS)
+pre_objs::  
 
-glLib:
-	@-if [ -d ../support/VGL ]; then \
-	    (cd ../support/VGL ; $(MAKE) ) ; \
-	fi
 
 
 
diff -r 25149dfd68e0 -r 7cd36eb4b09c stx_libview.st
--- a/stx_libview.st	Wed Sep 06 10:04:18 2017 +0200
+++ b/stx_libview.st	Wed Sep 06 11:13:09 2017 +0200
@@ -203,33 +203,13 @@
     "Modified: / 27-09-2011 / 18:10:19 / cg"
 !
 
-additionalRules_make_dot_proto
-    ^ '
-postMake:: $(LIBVIEW_EXTRA_TARGETS)
-
-glLib:
-        @-if [ -d ../support/VGL ]; then \
-            (cd ../support/VGL ; $(MAKE) ) ; \
-        fi
-'
-
-    "Modified: / 06-09-2017 / 09:57:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 additionalSharedLinkLibraries_make_dot_proto
     "allows for additional shared libraries to be added to the make.proto file."
 
     ^ '-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB) '
 
     "Created: / 06-09-2017 / 09:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-additionalTargets_make_dot_proto
-    "allows for additional targets to be added to the make.proto file."
-
-    ^ 'glLib'
-
-    "Created: / 06-09-2017 / 09:57:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-09-2017 / 22:21:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 localDefines_unix