diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2005-05-26 03:47:34 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2005-05-26 03:47:34 +0000 |
| commit | 978d2fda3c67ff1f32d457c462304517795d59a5 (patch) | |
| tree | e7ebe3161e49f34aea292147eede2185c26bbf17 | |
| parent | ae516306b4df5d4a2a4bb67c8e705aa67891681a (diff) | |
make linux-solo and linux-solo-x86 config files hierarchical
| -rw-r--r-- | configs/linux-solo | 18 | ||||
| -rw-r--r-- | configs/linux-solo-x86 | 32 |
2 files changed, 21 insertions, 29 deletions
diff --git a/configs/linux-solo b/configs/linux-solo index cd9d72050e..aeb84fea9c 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -8,11 +8,23 @@ CONFIG_NAME = linux-solo CC = gcc CXX = g++ -DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC +WARN_FLAGS = -Wall -Wundef +OPT_FLAGS = -O3 -g +PIC_FLAGS = -fPIC + +# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. +ARCH_FLAGS ?= -CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math +DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \ + -D_BSD_SOURCE -D_GNU_SOURCE \ + -DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC +CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \ + $(ASM_FLAGS) -std=c99 -ffast-math + +CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + +ASM_SOURCES = # Library/program dependencies DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR) -lEGL -l$(GL_LIB) diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86 index 5182c865e7..b4e79ba2c0 100644 --- a/configs/linux-solo-x86 +++ b/configs/linux-solo-x86 @@ -1,32 +1,12 @@ -# Configuration for linux-solo: Linux DRI hardware drivers for fbdev +# -*-makefile-*- +# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86 -include $(TOP)/configs/default +include $(TOP)/configs/linux-solo CONFIG_NAME = linux-solo-x86 -# Compiler and flags -CC = gcc -CXX = g++ - -DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC - -CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math - -CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC - +# Unnecessary on x86, generally. +PIC_FLAGS = +ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM ASM_SOURCES = $(X86_SOURCES) - -# Library/program dependencies -DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -GL_LIB_DEPS = -lm -lpthread -ldl -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread - -# Directories -SRC_DIRS = mesa glx/mini glu glut/mini -DRIVER_DIRS = dri -PROGRAM_DIRS = miniglx - -#DRI_DIRS = fb ffb gamma sis savage -DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome |