diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/.gitignore | 1 | ||||
| -rw-r--r-- | configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri-x86-64 | 2 | ||||
| -rw-r--r-- | configs/linux-fbdev | 10 | ||||
| -rw-r--r-- | configs/linux-static | 5 |
6 files changed, 14 insertions, 10 deletions
diff --git a/configs/.gitignore b/configs/.gitignore new file mode 100644 index 00000000000..5b9023a315a --- /dev/null +++ b/configs/.gitignore @@ -0,0 +1 @@ +current diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 68877c612e7..1492e4a4d9b 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -28,7 +28,8 @@ ASM_SOURCES = LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB) +GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread $(LIBDRM_LIB) GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 diff --git a/configs/linux-dri b/configs/linux-dri index 7e822e2eb61..5f945a73f1a 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -41,7 +41,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `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 -lm -lpthread -ldl \ +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl \ $(LIBDRM_LIB) diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 4fbd0a0876d..821ab3e3366 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64 # the new interface. i810 are missing because there is no x86-64 # system where they could *ever* be used. # -DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 +DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 diff --git a/configs/linux-fbdev b/configs/linux-fbdev index 7a5d1b600f9..e36d20a702c 100644 --- a/configs/linux-fbdev +++ b/configs/linux-fbdev @@ -4,17 +4,13 @@ include $(TOP)/configs/linux CONFIG_NAME = linux-fbdev -DRIVER_DIRS = fbdev +CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER SRC_DIRS = mesa glu glut/fbdev - -CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER - - -SRC_DIRS = mesa glu glut/fbdev -DRIVER_DIRS = fbdev +DRIVER_DIRS = fbdev osmesa PROGRAM_DIRS = fbdev demos redbook samples GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread +OSMESA_LIB_DEPS = -lm -lpthread GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm diff --git a/configs/linux-static b/configs/linux-static index 0104d34022b..85141ea643f 100644 --- a/configs/linux-static +++ b/configs/linux-static @@ -19,3 +19,8 @@ OSMESA_LIB_DEPS = GLU_LIB_DEPS = GLUT_LIB_DEPS = GLW_LIB_DEPS = + +# Need to specify all libraries we may need +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \ + -L/usr/X11R6/lib/ -lX11 -lXmu -lXi -lpthread + |