summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configs/beos3
-rw-r--r--configs/freebsd-dri-amd643
-rw-r--r--configs/freebsd-dri-x861
-rw-r--r--configs/linux-directfb3
-rw-r--r--configs/linux-dri-x861
-rw-r--r--configs/linux-dri-x86-643
-rw-r--r--configs/linux-icc3
-rw-r--r--configs/linux-icc-static3
-rw-r--r--configs/linux-solo-x861
-rw-r--r--configs/linux-x863
-rw-r--r--configs/linux-x86-643
-rw-r--r--configs/linux-x86-glide3
-rw-r--r--configs/linux-x86-xcb3
-rw-r--r--configs/sunos5-gcc3
-rw-r--r--src/glx/x11/Makefile22
-rw-r--r--src/mesa/sources8
16 files changed, 41 insertions, 25 deletions
diff --git a/configs/beos b/configs/beos
index 1d2eaa9599..007a929f88 100644
--- a/configs/beos
+++ b/configs/beos
@@ -26,7 +26,8 @@ ifeq ($(CPU), x86)
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM
- ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ ASM_SOURCES = $(X86_SOURCES)
+ ASM_API = $(X86_API)
CC = gcc
CXX = g++
diff --git a/configs/freebsd-dri-amd64 b/configs/freebsd-dri-amd64
index ffddfd8354..39341b9701 100644
--- a/configs/freebsd-dri-amd64
+++ b/configs/freebsd-dri-amd64
@@ -6,4 +6,5 @@ include $(TOP)/configs/freebsd-dri
CONFIG_NAME = freebsd-dri-x86-64
ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
diff --git a/configs/freebsd-dri-x86 b/configs/freebsd-dri-x86
index 31316b1f7a..af0d27ff47 100644
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -10,3 +10,4 @@ PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-directfb b/configs/linux-directfb
index f09c69ddab..42f7d29fca 100644
--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -17,7 +17,8 @@ HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
ifeq ($(HAVE_X86), yes)
CFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
- ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ ASM_SOURCES = $(X86_SOURCES)
+ ASM_API = $(X86_API)
endif
# Directories
diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index bef24e059e..b196004e58 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -13,4 +13,5 @@ ARCH_FLAGS = -m32
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index affbe2bc61..56597d82a3 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -8,7 +8,8 @@ CONFIG_NAME = linux-dri-x86-64
ARCH_FLAGS = -m64
ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
LIB_DIR = $(TOP)/lib64
diff --git a/configs/linux-icc b/configs/linux-icc
index 0da3b836a7..1d51d6e697 100644
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -16,6 +16,7 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-icc-static b/configs/linux-icc-static
index 5c65f05618..ac847a9215 100644
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -24,6 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lX
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
MKLIB_OPTIONS = -arch icc
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
index b4e79ba2c0..13cab37658 100644
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -10,3 +10,4 @@ PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-x86 b/configs/linux-x86
index b239653e6b..18fa06101d 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -5,4 +5,5 @@ include $(TOP)/configs/linux
CONFIG_NAME = linux-x86
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index f8ff5489f1..a89c47eb93 100644
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -6,7 +6,8 @@ CONFIG_NAME = linux-x86-64
ARCH_FLAGS = -m64
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
ASM_FLAGS = -DUSE_X86_64_ASM
LIB_DIR = $(TOP)/lib64
diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide
index b874b923ff..1397bdc015 100644
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -15,7 +15,8 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
GLUT_CFLAGS = -fexceptions
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
diff --git a/configs/linux-x86-xcb b/configs/linux-x86-xcb
index 7c5074c308..a3eeb108bf 100644
--- a/configs/linux-x86-xcb
+++ b/configs/linux-x86-xcb
@@ -15,7 +15,8 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
GLUT_CFLAGS = -fexceptions
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB
diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc
index 7917c9b004..8d6223cea8 100644
--- a/configs/sunos5-gcc
+++ b/configs/sunos5-gcc
@@ -16,7 +16,8 @@ ARCH_FLAGS ?=
DEFINES = -D_REENTRANT -DUSE_XSHM
-ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
+ASM_SOURCES = $(SPARC_SOURCES)
+ASM_API = $(SPARC_API)
ASM_FLAGS = -DUSE_SPARC_ASM
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 415ec02dd6..84e244501a 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -3,10 +3,7 @@ include $(TOP)/configs/current
DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
-C_SOURCES = \
- $(TOP)/src/mesa/glapi/glapi.c \
- $(TOP)/src/mesa/glapi/glthread.c \
- $(TOP)/src/mesa/main/dispatch.c \
+SOURCES = \
glcontextmodes.c \
clientattrib.c \
compsize.c \
@@ -33,15 +30,15 @@ C_SOURCES = \
glx_query.c \
glx_texture_compression.c \
dri_glx.c \
- XF86dri.c \
+ XF86dri.c
-X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
-X86-64_SOURCES = $(TOP)/src/mesa/x86-64/glapi_x86-64.S
+include $(TOP)/src/mesa/sources
-# ASM_SOURCES = $(X86_SOURCES)
+MESA_ASM_API = $(addprefix $(TOP)/src/mesa/, $(ASM_API))
+MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES))
+MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS))
-OBJECTS = $(C_SOURCES:.c=.o) \
- $(ASM_SOURCES:.S=.o)
+OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
INCLUDES = -I. \
-I$(TOP)/include \
@@ -75,9 +72,10 @@ $(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
-install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
-depend: $(C_SOURCES) $(ASM_SOURCES) Makefile
+depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
touch depend
- $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES)
+ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
+ $(MESA_GLAPI_SOURCES) $(MESA_ASM_API)
# Emacs tags
diff --git a/src/mesa/sources b/src/mesa/sources
index 627fa5144d..0756dd36f7 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -16,7 +16,6 @@ MAIN_SOURCES = \
main/convolve.c \
main/debug.c \
main/depth.c \
- main/dispatch.c \
main/dlist.c \
main/drawpix.c \
main/enable.c \
@@ -59,6 +58,7 @@ MAIN_SOURCES = \
main/vtxfmt.c
GLAPI_SOURCES = \
+ main/dispatch.c \
glapi/glapi.c \
glapi/glthread.c
@@ -302,6 +302,10 @@ SOLO_SOURCES = \
# $(SLANG_C_SOURCES)
+CORE_SOURCES = \
+ $(GLAPI_SOURCES) \
+ $(SOLO_SOURCES)
+
### Object files
@@ -311,7 +315,7 @@ SOLO_OBJECTS = \
GLAPI_OBJECTS = \
$(GLAPI_SOURCES:.c=.o) \
- $(ASM_API_SOURCES:.S=.o)
+ $(ASM_API:.S=.o)
CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:13:29 +0000