Skip to content

N
nx-libs
Commit 0887e3ad authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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)
parent d877b46d
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 208 deletions
nx-X11/programs/Xserver/GL/Imakefile
View file @ 0887e3ad
...@@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich ...@@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich
#define IHaveSubdirs #define IHaveSubdirs
#if GlxUseSGISI
CORE_SUBDIR = /* opengl */
#elif defined(DarwinArchitecture) && DarwinQuartzSupport
CORE_SUBDIR = apple mesa
#elif defined(cygwinArchitecture) && GlxUseWindows
CORE_SUBDIR = windows mesa
#elif defined(Win32Architecture) && GlxUseWindows
CORE_SUBDIR = windows
#else
CORE_SUBDIR = mesa CORE_SUBDIR = mesa
#endif
#if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
|| (defined(XorgServer) && XorgServer))
DRI_SUBDIR = dri
#endif
SUBDIRS = glx $(DRI_SUBDIR) $(CORE_SUBDIR) SUBDIRS = glx $(CORE_SUBDIR)
#if DoLoadableServer #if DoLoadableServer
MSRCS = glxmodule.c MSRCS = glxmodule.c
...@@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS) ...@@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS)
DONES = glx/DONE DONES = glx/DONE
INCLUDES = -Iinclude -Idri -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \
-I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)
DEPEND_DEFINES = $(EXT_DEFINES) DependDefines DEPEND_DEFINES = $(EXT_DEFINES) DependDefines
DEFINES = $(GLX_DEFINES) DEFINES = $(GLX_DEFINES)
......
nx-X11/programs/Xserver/GL/mesa/X/Imakefile
View file @ 0887e3ad
...@@ -58,7 +58,6 @@ NormalLibraryObjectRule() ...@@ -58,7 +58,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
View file @ 0887e3ad
...@@ -35,7 +35,6 @@ NormalLibraryObjectRule() ...@@ -35,7 +35,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/main/Imakefile
View file @ 0887e3ad
...@@ -40,7 +40,6 @@ NormalLibraryObjectRule() ...@@ -40,7 +40,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/math/Imakefile
View file @ 0887e3ad
...@@ -34,7 +34,6 @@ NormalLibraryObjectRule() ...@@ -34,7 +34,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
View file @ 0887e3ad
...@@ -37,7 +37,6 @@ NormalLibraryObjectRule() ...@@ -37,7 +37,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
View file @ 0887e3ad
...@@ -33,7 +33,6 @@ NormalLibraryObjectRule() ...@@ -33,7 +33,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
View file @ 0887e3ad
...@@ -36,7 +36,6 @@ NormalLibraryObjectRule() ...@@ -36,7 +36,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
View file @ 0887e3ad
...@@ -42,7 +42,6 @@ NormalLibraryObjectRule() ...@@ -42,7 +42,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
View file @ 0887e3ad
...@@ -34,7 +34,6 @@ NormalLibraryObjectRule() ...@@ -34,7 +34,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
View file @ 0887e3ad
...@@ -45,7 +45,6 @@ NormalLibraryObjectRule() ...@@ -45,7 +45,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS)) SubdirLibraryRule($(OBJS))
LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS)) NormalLintTarget($(SRCS))
DependTarget() DependTarget()
......
nx-X11/programs/Xserver/GL/opengl/Imakefile deleted 100644 → 0
View file @ d877b46d
XCOMM $XFree86$
XCOMM The contents of this file are subject to the GLX Public License Version 1.0
XCOMM (the "License"). You may not use this file except in compliance with the
XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc.,
XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
XCOMM or at http://www.sgi.com/software/opensource/glx/license.html.
XCOMM
XCOMM Software distributed under the License is distributed on an "AS IS"
XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
XCOMM language governing rights and limitations under the License.
XCOMM
XCOMM The Original Software is GLX version 1.2 source code, released February,
XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc.
XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
#include <Library.tmpl>
OBJS = \
ddxci.o \
ddxcx.o \
ddxrgb.o \
ddxscreens.o \
dl_block.o \
dl_heap.o \
dl_init.o \
dl_list.o \
dl_mopt.o \
dl_opt.o \
dl_pplst.o \
dl_splc.o \
dl_splst.o \
dl_table.o \
g_api.o \
g_disp.o \
g_lcmpex.o \
g_lcomp.o \
g_lexec.o \
g_ltab.o \
g_noptab.o \
g_splcmp.o \
px_api.o \
px_mod.o \
px_pack.o \
px_paths.o \
px_read.o \
px_rend.o \
px_upack.o \
s_accum.o \
s_atest.o \
s_attrib.o \
s_bitmap.o \
s_blend.o \
s_btdraw.o \
s_buffer.o \
s_capi.o \
s_ci.o \
s_clear.o \
s_clip.o \
s_contxt.o \
s_cpydsp.o \
s_ctable.o \
s_depth.o \
s_dlist.o \
s_eval.o \
s_export.o \
s_feed.o \
s_finish.o \
s_fog.o \
s_get.o \
s_global.o \
s_image.o \
s_lcache.o \
s_lcomp.o \
s_light.o \
s_lnclip.o \
s_lndraw.o \
s_lnfast.o \
s_lnfin.o \
s_lnspan.o \
s_math.o \
s_memmgr.o \
s_names.o \
s_napi.o \
s_pgaa.o \
s_pgclip.o \
s_pgdraw.o \
s_pgfin.o \
s_pgmode.o \
s_pgspan.o \
s_pick.o \
s_prim.o \
s_ptaa.o \
s_ptdraw.o \
s_ptfin.o \
s_rapi.o \
s_rect.o \
s_rgb.o \
s_rpos.o \
s_select.o \
s_size.o \
s_span.o \
s_sten.o \
s_store.o \
s_tapi.o \
s_tex.o \
s_texel.o \
s_texmgr.o \
s_trap.o \
s_vapi.o \
s_varray.o \
s_vertex.o \
s_xform.o \
s_zfuncs.o \
vc_cache.o \
vc_line.o \
vc_point.o \
vc_poly.o
INCLUDES = \
-I. \
-I.. \
-Iinclude \
-I$(TOP)/server/include \
-I$(TOP)/programs/Xserver/include \
-I$(TOP)/include \
-I$(TOP)/include/GL \
-I$(INCLUDESRC)
DEFINES = \
-D_LANGUAGE_C \
-Dunix
NormalLibraryTarget(GL, $(OBJS))
NormalLibraryObjectRule()
DependTarget()
nx-X11/programs/Xserver/Imakefile
View file @ 0887e3ad
...@@ -71,39 +71,15 @@ INSTPGMFLAGS = ...@@ -71,39 +71,15 @@ INSTPGMFLAGS =
#define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs
#if BuildGlxExt #if BuildGlxExt
# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \ # if DoLoadableServer
|| (defined(XorgServer) && XorgServer))
DRILIB = GL/dri/ModuleLibraryTargetName(dri)
# else
DRILIB =
# endif
# if GlxUseSGISI
GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
GL/sgi-si/ModuleLibraryTargetName(GLcore) \
$(DRILIB)
# 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) \ GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
# else # else
GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
$(DRILIB)
# endif
# endif # endif
GLXDIR = GL GLXDIR = GL
# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows
GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB))
# else
GLXEXT = $(GLXLIB) GLXEXT = $(GLXLIB)
# endif
#endif #endif
#if BuildXInputExt #if BuildXInputExt
...@@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) ...@@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
XWINPARSERDIR = XWINPARSERDIR =
XWINPARSERLIB = XWINPARSERLIB =
#endif #endif
#if defined(GlxUseWindows) && GlxUseWindows
XWINOPENGLLIB = -lopengl32
#else
XWINOPENGLLIB = XWINOPENGLLIB =
#endif
NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin) NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin)
NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
...@@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC ...@@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC
# endif # endif
#endif #endif
#if defined(Win32Architecture) #if defined(Win32Architecture)
# if defined(GlxUseWindows) && GlxUseWindows XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB)
XWINGL32 = -lopengl32
# endif
XWINW32 = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB)
#else #else
XWINW32 = -lgdi32 XWINW32 = -lgdi32
#endif #endif
...@@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI ...@@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI
#ifdef mingwArchitecture #ifdef mingwArchitecture
NXWINSERVERNAME=NXming NXWINSERVERNAME=NXming
NXWINGLSERVERNAME=NXmingGL
#else #else
NXWINSERVERNAME=NXWin NXWINSERVERNAME=NXWin
NXWINGLSERVERNAME=NXWin_GL
#endif #endif
ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
$(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)) $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS))
#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows
ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
$(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\
$(XWINOPENGLLIB))
#endif
#ifndef ServerToInstall #ifndef ServerToInstall
# define ServerToInstall $(NXWINSERVERNAME) # define ServerToInstall $(NXWINSERVERNAME)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment