summaryrefslogtreecommitdiff
path: root/configs/linux-x86
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-07-02 07:38:40 +0000
committerIan Romanick <idr@us.ibm.com>2005-07-02 07:38:40 +0000
commit9204e87b2ea2e9b441ab6422ae58bfebb5cdffce (patch)
treebe328c011c71c6ae6763b69bc87afb35a13437f9 /configs/linux-x86
parent4f178c6e3a95848257edc4623c72fb0a8eebf282 (diff)
Massive refactor of (most of) the Linux config files. This reduces
the length of each config and brings a lot of much needed uniformity to them.
Diffstat (limited to 'configs/linux-x86')
-rw-r--r--configs/linux-x8636
1 files changed, 1 insertions, 35 deletions
diff --git a/configs/linux-x86 b/configs/linux-x86
index fddb9a3550f..b239653e6b9 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -1,42 +1,8 @@
# Configuration for Linux with x86 optimizations
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
CONFIG_NAME = linux-x86
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O3 -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
-# to build properly on 64-bit platforms.
-
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS -DUSE_XSHM
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(X11_INCLUDES)
-
-GLUT_CFLAGS = -fexceptions
-
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm