Commit e0338e26 authored by idr's avatar idr
Browse files

Move the X protocol related DRI files from lib/GL/dri to lib/GL/glx.

Soon the files in lib/GL/dri/drm will be removed (and libdrm.a will be
built from the "pristine" DRM source in the drm module of DRI CVS) and
the while lib/GL/dri tree will be gone.
parent 2ce24e60
......@@ -5,8 +5,13 @@
#define XFree86CustomVersion "DRI trunk"
/* You need this now */
#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa
#define DRMSrcDir /X11R6/SourceForge/DRI-freedesktop/drm
#define MesaSrcDir /usr/src/idr/Mesa-pristine
#define DRMSrcDir /usr/src/idr/dri-pristine/drm
#define CcCmd gcc3
#define HasGcc3 1
#define DefaultGcc2i386Opt -O0
/*#define DefaultGcc2i386Opt -O3 -momit-leaf-frame-pointer -march=pentium4*/
/* Don't use any special flags by default, but leave this here commented out
......@@ -26,7 +31,7 @@
*/
#define BuildXFree86ConfigTools YES
#define BuildXFree86ConfigTools NO
#if defined(PpcArchitecture)
......@@ -37,6 +42,7 @@
#define XF86CardDrivers tdfx i810 mga ati glint vga sis
#define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx ffb
/*#define DriDrivers r200 mga i810 radeon i830*/
#elif defined(AMD64Architecture)
......
......@@ -46,11 +46,6 @@ BASEREQUIREDLIBS = SharedGLReqs
GLXPOBJS = $(GLXLIBSRC)/glx/profiled/?*.o $(GLAPI_OBJ)
#if BuildXF86DRI
DRIOBJS = $(GLXLIBSRC)/dri/XF86dri.o $(GLXLIBSRC)/dri/dri_glx.o
DRIUOBJS = $(GLXLIBSRC)/dri/unshared/XF86dri.o $(GLXLIBSRC)/dri/unshared/dri_glx.o
DRIDOBJS = $(GLXLIBSRC)/dri/debugger/XF86dri.o $(GLXLIBSRC)/dri/debugger/dri_glx.o
DRIPOBJS = $(GLXLIBSRC)/dri/profiled/XF86dri.o $(GLXLIBSRC)/dri/profiled/dri_glx.o
DRMOBJS = $(GLXLIBSRC)/dri/drm/?*.o
DRMUOBJS = $(GLXLIBSRC)/dri/drm/unshared/?*.o
DRMDOBJS = $(GLXLIBSRC)/dri/drm/debugger/?*.o
......
......@@ -87,7 +87,7 @@ LIBGLBUILDDIR = GL
* BuildXF86DRI
*/
#if BuildXF86DRI
DRIDIRS = dri
DRIDIRS = dri/drm
#endif
/*
......
XCOMM $XFree86: xc/lib/GL/dri/Imakefile,v 1.10 2002/02/22 21:32:51 dawes Exp $
#include <Threads.tmpl>
#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
#define DoExtraLib SharedLibGlx
#define DoDebugLib DebugLibGlx
#define DoProfileLib ProfileLibGlx
#if Malloc0ReturnsNull
ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
#if !GlxUseSGISI
DRI_SRCS = dri_glx.c
DRI_OBJS = dri_glx.o
DRI_INCS = -I. -I$(GLXLIBSRC)/glx \
-I$(XINCLUDESRC) -I$(SERVERSRC)/GL/dri \
-I$(GLXLIBSRC)/include \
-I$(MESASRCDIR)/include \
-I$(MESASRCDIR)/src/mesa/main \
-I$(MESASRCDIR)/src/mesa/glapi
#endif
#if GlxUseBuiltInDRIDriver
GLX_DEFS = -DBUILT_IN_DRI_DRIVER
#endif
PATHDEFINES = -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
DEFINES = $(ALLOC_DEFINES) GlxDefines $(GLX_DEFS) $(PATHDEFINES)
INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I$(XF86OSSRC) $(DRI_INCS)
SRCS = XF86dri.c $(DRI_SRCS)
OBJS = XF86dri.o $(DRI_OBJS)
#include <Library.tmpl>
LibraryObjectRule()
SubdirLibraryRule($(OBJS))
NormalLintTarget($(SRCS))
#define IHaveSubdirs
#define PassCDebugFlags
SUBDIRS = drm
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
DependTarget()
......@@ -107,7 +107,10 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
#endif
#if BuildXF86DRI
DRI_INCS = -I$(GLXLIBSRC)/dri -I$(SERVERSRC)/GL/dri
DRI_SRCS = dri_glx.c XF86dri.c
DRI_OBJS = dri_glx.o XF86dri.o
DRI_INCS = -I$(SERVERSRC)/GL/dri
#if defined(i386Architecture) && MesaUseX86Asm
ASM_SRCS = glapi_x86.S
ASM_OBJS = glapi_x86.o
......@@ -124,8 +127,8 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
#endif
#endif
SRCS = $(GLX_SRCS) $(ASM_SRCS)
OBJS = $(GLX_OBJS) $(ASM_OBJS)
SRCS = $(GLX_SRCS) $(ASM_SRCS) $(DRI_SRCS)
OBJS = $(GLX_OBJS) $(ASM_OBJS) $(DRI_OBJS)
DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES)
INCLUDES = -I$(XINCLUDESRC) \
......@@ -137,6 +140,7 @@ LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
-I$(MESASRCDIR)/src/mesa/drivers/x11 \
-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-I$(XF86OSSRC) \
-I$(DRMSRCDIR)/shared \
$(DRI_INCS)
#include <Library.tmpl>
......
......@@ -18,8 +18,8 @@ MOBJ = drimodule.o
-I$(SERVERSRC)/mi -I$(FONTINCSRC)
DEFINES = $(GLX_DEFINES)
LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/dri)
LinkSourceFile(xf86dristr.h,$(LIBSRC)/GL/dri)
LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/glx)
LinkSourceFile(xf86dristr.h,$(LIBSRC)/GL/glx)
ModuleObjectRule()
LibraryModuleTarget(dri,$(OBJS))
......
......@@ -54,7 +54,8 @@ GLXSRV_DEFINES = -DXFree86Server
-I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \
-I$(SERVERSRC)/include -I$(SERVERSRC)/GL/include \
-I$(SERVERSRC)/GL/glx \
-I$(XF86OSSRC)
-I$(XF86OSSRC) \
-I$(DRMSRCDIR)/shared
DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
......
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