diff options
| author | Kristian Høgsberg <[email protected]> | 2010-02-09 09:58:36 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-02-09 09:58:36 -0500 |
| commit | 6e8897ff9f90601ebf6eed500ad942c11b54d1f7 (patch) | |
| tree | 5a90891cfbccbf5c03f792abb2a2407c82872778 /configs | |
| parent | 538539d8791e5b3b1ea2e95473b589934d94497e (diff) | |
Retire miniglx and move the actual glx code up to src/glx
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/darwin | 4 | ||||
| -rw-r--r-- | configs/freebsd-dri | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-dri-xcb | 2 | ||||
| -rw-r--r-- | configs/linux-indirect | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/configs/darwin b/configs/darwin index 7556688fe6d..d28d5906ba1 100644 --- a/configs/darwin +++ b/configs/darwin @@ -16,7 +16,7 @@ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING # -D_GNU_SOURCE - for src/mesa/main ... -# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11 +# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx # -DGLX_USE_APPLEGL - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile # -DIN_DRI_DRIVER @@ -49,7 +49,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glsl glx/x11 mesa gallium glu glut/glx glew +SRC_DIRS = glsl glx mesa gallium glu glut/glx glew GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 0ec25f916ed..da63e3b78c5 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -41,7 +41,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 # Directories -SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw +SRC_DIRS = glx gallium mesa glu glut/glx glew glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-dri b/configs/linux-dri index 95f77ade1dd..634546c64ca 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -51,7 +51,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories -SRC_DIRS := glx/x11 egl $(SRC_DIRS) +SRC_DIRS := glx egl $(SRC_DIRS) PROGRAM_DIRS := egl $(PROGRAM_DIRS) # EGL directories diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 7b99dccdb88..691f8e4918c 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -47,7 +47,7 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx) -SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw +SRC_DIRS = glx gallium mesa glu glut/glx glew glw PROGRAM_DIRS = xdemos DRIVER_DIRS = dri diff --git a/configs/linux-indirect b/configs/linux-indirect index 4b81383c072..0914fba19bc 100644 --- a/configs/linux-indirect +++ b/configs/linux-indirect @@ -47,7 +47,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl # Directories -SRC_DIRS = glx/x11 glu glut/glx glew glw +SRC_DIRS = glx glu glut/glx glew glw DRIVER_DIRS = PROGRAM_DIRS = WINDOW_SYSTEM=dri |