OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/es: Link to libX11.
[android-x86/external-mesa.git]
/
configs
/
linux-dri
diff --git
a/configs/linux-dri
b/configs/linux-dri
index
74f81bf
..
0998ba8
100644
(file)
--- a/
configs/linux-dri
+++ b/
configs/linux-dri
@@
-32,6
+32,11
@@
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
MESA_ASM_SOURCES =
MESA_ASM_SOURCES =
@@
-42,30
+47,21
@@
LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
LIBDRM_LIB = $(shell pkg-config --libs libdrm)
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
LIBDRM_LIB = $(shell pkg-config --libs libdrm)
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
- -lm -lpthread -ldl \
- $(LIBDRM_LIB)
-
+ -lm -lpthread -ldl $(LIBDRM_LIB)
-# This is now 0 by default since it seems to confuse the hell out of people
-# and generate a lot of extra noise on bugzilla. If you need to build with
-# EGL, do 'make linux-dri USING_EGL=1'
-
-USING_EGL=0
# Directories
# Directories
-SRC_DIRS := glx/x11 $(SRC_DIRS)
-ifeq ($(USING_EGL), 1)
-SRC_DIRS := egl $(SRC_DIRS)
-PROGRAM_DIRS = egl
-endif
-
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
+# EGL directories
+EGL_DRIVERS_DIRS = demo glx
-DRIVER_DIRS =
+DRIVER_DIRS =
dri
WINDOW_SYSTEM = dri
WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = dri egl_xlib
-GALLIUM_WINSYS_COMMON_DIRS = intel_drm
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = intel
+GALLIUM_STATE_TRACKERS_DIRS = egl
-# gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = nouveau
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+ savage sis tdfx trident unichrome ffb swrast