diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 12 | ||||
| -rw-r--r-- | configs/darwin | 7 | ||||
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configs/linux-egl | 2 | ||||
| -rw-r--r-- | configs/linux-opengl-es | 2 | ||||
| -rw-r--r-- | configs/linux-osmesa | 6 | ||||
| -rw-r--r-- | configs/linux-osmesa16 | 2 | ||||
| -rw-r--r-- | configs/linux-osmesa32 | 2 |
8 files changed, 25 insertions, 10 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 2235abe73f..eeb99780be 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -28,6 +28,10 @@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ X11_LIBS = @X11_LIBS@ X11_CFLAGS = @X11_CFLAGS@ +LLVM_CFLAGS = @LLVM_CFLAGS@ +LLVM_LDFLAGS = @LLVM_LDFLAGS@ +LLVM_LIBS = @LLVM_LIBS@ + # Assembler MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ @@ -169,3 +173,11 @@ GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@ EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@ EGL_DRI2_LIBS = @EGL_DRI2_LIBS@ + +MESA_LLVM = @MESA_LLVM@ + +LLVM_VERSION = @LLVM_VERSION@ +ifneq ($(LLVM_VERSION),) + HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=)) + DEFINES += -DHAVE_LLVM=$(HAVE_LLVM) +endif diff --git a/configs/darwin b/configs/darwin index d28d5906ba..e519684877 100644 --- a/configs/darwin +++ b/configs/darwin @@ -13,7 +13,10 @@ CC = gcc CXX = g++ PIC_FLAGS = -fPIC DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ - -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING + -DGLX_ALIAS_UNSUPPORTED \ + -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL + +# -DGLX_INDIRECT_RENDERING \ # -D_GNU_SOURCE - for src/mesa/main ... # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx @@ -49,7 +52,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 mesa gallium glu glut/glx glew +SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri diff --git a/configs/linux-dri b/configs/linux-dri index 9017becdaf..49e3579046 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -52,7 +52,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories SRC_DIRS := glx egl $(SRC_DIRS) -PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS) +PROGRAM_DIRS := egl/eglut egl/opengl $(PROGRAM_DIRS) # EGL directories EGL_DRIVERS_DIRS = glx diff --git a/configs/linux-egl b/configs/linux-egl index cd664b4171..566c7b941c 100644 --- a/configs/linux-egl +++ b/configs/linux-egl @@ -48,7 +48,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl -PROGRAM_DIRS = egl/opengl +PROGRAM_DIRS = egl/eglut egl/opengl DRIVER_DIRS = dri GALLIUM_WINSYS_DIRS = egl_drm diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index ead47136f4..6984aa9b2c 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -7,7 +7,7 @@ CONFIG_NAME = linux-opengl-es # Directories to build LIB_DIR = lib SRC_DIRS = egl glsl mesa/es gallium gallium/winsys gallium/targets -PROGRAM_DIRS = egl/opengles1 egl/opengles2 +PROGRAM_DIRS = egl/eglut egl/opengles1 egl/opengles2 # egl st needs this DEFINES += -DGLX_DIRECT_RENDERING diff --git a/configs/linux-osmesa b/configs/linux-osmesa index c112642f89..3015f5fcbb 100644 --- a/configs/linux-osmesa +++ b/configs/linux-osmesa @@ -9,7 +9,7 @@ CONFIG_NAME = linux-osmesa # Compiler and flags CC = gcc CXX = g++ -CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS +CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE # Work around aliasing bugs - developers should comment this out @@ -17,12 +17,12 @@ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = osdemos # Dependencies -OSMESA_LIB_DEPS = -lm -lpthread +OSMESA_LIB_DEPS = -lm -lpthread -ldl GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lm -lpthread diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16 index b3c8da0991..090ca27309 100644 --- a/configs/linux-osmesa16 +++ b/configs/linux-osmesa16 @@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa16.so # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32 index 5804ef8e5f..63de7f9a46 100644 --- a/configs/linux-osmesa32 +++ b/configs/linux-osmesa32 @@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa32.so # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = |