From 73fa8999135be4f036d50d647102835a01be0e0e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 26 May 2015 16:44:49 +0200
Subject: Drop unused / untested Xserver GLX extension support / build logic.

* MS Windows (non-tested)
* Mac OS X (not provided)
* SGISI / opengl (not provided)
* DRI support (nxagent uses Mesa software emulation only)
---
 nx-X11/programs/Xserver/Imakefile | 44 +++------------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

(limited to 'nx-X11/programs/Xserver/Imakefile')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 9f730cb97..5ddfb9b5e 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -71,39 +71,15 @@ INSTPGMFLAGS =
 #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs
 
 #if BuildGlxExt
-# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
-	|| (defined(XorgServer) && XorgServer))
-      DRILIB = GL/dri/ModuleLibraryTargetName(dri)
-# else
-      DRILIB = 
-# endif
-# if GlxUseSGISI
+# if DoLoadableServer
       GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/sgi-si/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
+               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
 # else
-#  if defined(GlxUseWindows) && GlxUseWindows
-      XWin_GL.exe.GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  endif /* GlxUseWindows */
-#  if defined(Win32Architecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  elif DoLoadableServer
       GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
                GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
-#  else
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
-#  endif
 # endif
       GLXDIR = GL
-# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB))
-# else
       GLXEXT = $(GLXLIB)
-# endif
 #endif
 
 #if BuildXInputExt
@@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
 XWINPARSERDIR = 
 XWINPARSERLIB = 
 #endif
-#if defined(GlxUseWindows) && GlxUseWindows
-XWINOPENGLLIB = -lopengl32
-#else
 XWINOPENGLLIB = 
-#endif
 
 NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin)
 NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
@@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC
 # endif
 #endif
 #if defined(Win32Architecture)
-# if defined(GlxUseWindows) && GlxUseWindows
-XWINGL32 = -lopengl32
-# endif
-XWINW32  = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB) 
+XWINW32  = -lgdi32 -lwsock32 $(PTHREADLIB)
 #else
 XWINW32  = -lgdi32
 #endif
@@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI
 
 #ifdef mingwArchitecture
 NXWINSERVERNAME=NXming    
-NXWINGLSERVERNAME=NXmingGL    
 #else
 NXWINSERVERNAME=NXWin    
-NXWINGLSERVERNAME=NXWin_GL 
 #endif
 ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
 	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS))
-#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows 
-ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
-	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\
-	     $(XWINOPENGLLIB)) 
-#endif
 
 #ifndef ServerToInstall
 # define ServerToInstall $(NXWINSERVERNAME)
-- 
cgit v1.2.3