diff options
| author | Ian Romanick <[email protected]> | 2005-07-02 07:11:54 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2005-07-02 07:11:54 +0000 |
| commit | ef2ce9d003fc69741bb02262f89ea35e948cbb5b (patch) | |
| tree | 2770d39b50289d058f0de526e34427ad85bd57c9 | |
| parent | c1c684b0f3860099b9e6e77df4451bb61474736b (diff) | |
Make linux-x86 more like the other linux configs.
| -rw-r--r-- | configs/linux-x86 | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/configs/linux-x86 b/configs/linux-x86 index 3cfee035d0d..fddb9a3550f 100644 --- a/configs/linux-x86 +++ b/configs/linux-x86 @@ -8,17 +8,35 @@ CONFIG_NAME = linux-x86 CC = gcc CXX = g++ -CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include +WARN_FLAGS = -Wall +OPT_FLAGS = -O3 -g +PIC_FLAGS = -fPIC -CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE +# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32 +# to build properly on 64-bit platforms. -GLUT_CFLAGS = -fexceptions +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 -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 +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 |