Don't include glapi_*.S files in DRI / solo builds.
This commit is contained in:
parent
6b869d4fe1
commit
ea93e6d378
|
@ -17,6 +17,6 @@ GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
|
||||||
GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
|
APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES)" \
|
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,6 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
|
||||||
MKLIB_OPTIONS = -arch icc
|
MKLIB_OPTIONS = -arch icc
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES)" \
|
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
|
||||||
GLUT_CFLAGS = -fexceptions
|
GLUT_CFLAGS = -fexceptions
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES)
|
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
||||||
|
|
||||||
# Library/program dependencies
|
# Library/program dependencies
|
||||||
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
|
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
|
||||||
|
|
|
@ -15,7 +15,7 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
|
||||||
GLUT_CFLAGS = -fexceptions
|
GLUT_CFLAGS = -fexceptions
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES)
|
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
||||||
|
|
||||||
# Library/program dependencies
|
# Library/program dependencies
|
||||||
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
|
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
|
||||||
|
|
|
@ -25,4 +25,4 @@ GLW_LIB_NAME = libGLw.a
|
||||||
OSMESA_LIB_NAME = libOSMesa.a
|
OSMESA_LIB_NAME = libOSMesa.a
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES)
|
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
||||||
|
|
|
@ -152,7 +152,6 @@ ASM_C_SOURCES = \
|
||||||
|
|
||||||
X86_SOURCES = \
|
X86_SOURCES = \
|
||||||
x86/common_x86_asm.S \
|
x86/common_x86_asm.S \
|
||||||
x86/glapi_x86.S \
|
|
||||||
x86/x86_xform2.S \
|
x86/x86_xform2.S \
|
||||||
x86/x86_xform3.S \
|
x86/x86_xform3.S \
|
||||||
x86/x86_xform4.S \
|
x86/x86_xform4.S \
|
||||||
|
@ -170,12 +169,17 @@ X86_SOURCES = \
|
||||||
x86/sse_normal.S \
|
x86/sse_normal.S \
|
||||||
tnl/t_vtx_x86_gcc.S
|
tnl/t_vtx_x86_gcc.S
|
||||||
|
|
||||||
|
X86_API = \
|
||||||
|
x86/glapi_x86.S
|
||||||
|
|
||||||
SPARC_SOURCES = \
|
SPARC_SOURCES = \
|
||||||
sparc/clip.S \
|
sparc/clip.S \
|
||||||
sparc/glapi_sparc.S \
|
|
||||||
sparc/norm.S \
|
sparc/norm.S \
|
||||||
sparc/xform.S
|
sparc/xform.S
|
||||||
|
|
||||||
|
SPARC_API = \
|
||||||
|
sparc/glapi_sparc.S
|
||||||
|
|
||||||
COMMON_DRIVER_SOURCES = \
|
COMMON_DRIVER_SOURCES = \
|
||||||
drivers/common/driverfuncs.c
|
drivers/common/driverfuncs.c
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue