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.
This commit is contained in:
@@ -66,9 +66,10 @@ PROGRAM_DIRS = demos redbook samples xdemos
|
|||||||
|
|
||||||
|
|
||||||
# Library/program dependencies
|
# Library/program dependencies
|
||||||
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
|
EXTRA_LIB_PATH ?=
|
||||||
|
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
|
||||||
OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
|
OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
|
||||||
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
|
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
|
||||||
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
|
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) -lXt -lX11
|
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
|
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
|
||||||
|
@@ -8,13 +8,26 @@ CONFIG_NAME = linux
|
|||||||
CC = gcc
|
CC = gcc
|
||||||
CXX = g++
|
CXX = g++
|
||||||
|
|
||||||
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
|
WARN_FLAGS = -Wall
|
||||||
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
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 -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
|
GLUT_CFLAGS = -fexceptions
|
||||||
|
|
||||||
|
EXTRA_LIB_PATH = -L/usr/X11R6/lib
|
||||||
# Library/program dependencies
|
|
||||||
# Need to have -L/usr/X11R6/lib in these:
|
|
||||||
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
|
|
||||||
|
@@ -1,20 +1,8 @@
|
|||||||
# Configuration for debugging on Linux
|
# Configuration for debugging on Linux
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux
|
||||||
|
|
||||||
CONFIG_NAME = linux-debug
|
CONFIG_NAME = linux-debug
|
||||||
|
|
||||||
# Compiler and flags
|
OPT_FLAGS = -g
|
||||||
CC = gcc
|
DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG
|
|
||||||
|
|
||||||
CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
|
|
||||||
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
# Need to have -L/usr/X11R6/lib in these:
|
|
||||||
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) -lXt -L/usr/X11R6/lib -lX11
|
|
||||||
|
@@ -39,8 +39,6 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
|||||||
|
|
||||||
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
|
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
|
||||||
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
|
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
|
||||||
GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
|
|
||||||
GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
|
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
|
@@ -7,6 +7,9 @@ CONFIG_NAME = linux-dri-x86-64
|
|||||||
|
|
||||||
ARCH_FLAGS = -m64
|
ARCH_FLAGS = -m64
|
||||||
|
|
||||||
|
ASM_FLAGS = -DUSE_X86_64_ASM
|
||||||
|
ASM_SOURCES = $(X86-64_SOURCES)
|
||||||
|
|
||||||
LIB_DIR = $(TOP)/lib64
|
LIB_DIR = $(TOP)/lib64
|
||||||
|
|
||||||
# Library/program dependencies
|
# Library/program dependencies
|
||||||
|
@@ -1,18 +1,9 @@
|
|||||||
# Configuration for Linux on PPC
|
# Configuration for Linux on PPC
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux
|
||||||
|
|
||||||
CONFIG_NAME = linux-ppc
|
CONFIG_NAME = linux-ppc
|
||||||
|
|
||||||
# Compiler and flags
|
OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
|
|
||||||
CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
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
|
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
|
|
||||||
|
|
||||||
|
# FIXME: Use of PowerPC assembly should be enabled here.
|
@@ -1,15 +1,9 @@
|
|||||||
# Configuration for Linux on PPC, static libs
|
# Configuration for Linux on PPC, static libs
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux-ppc
|
||||||
|
|
||||||
CONFIG_NAME = linux-ppc-static
|
CONFIG_NAME = linux-ppc-static
|
||||||
|
|
||||||
# Compiler and flags
|
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
|
|
||||||
CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
MKLIB_OPTIONS = -static
|
MKLIB_OPTIONS = -static
|
||||||
|
|
||||||
# Library names (actual file names)
|
# Library names (actual file names)
|
||||||
@@ -18,9 +12,3 @@ GLU_LIB_NAME = libGLU.a
|
|||||||
GLUT_LIB_NAME = libglut.a
|
GLUT_LIB_NAME = libglut.a
|
||||||
GLW_LIB_NAME = libGLw.a
|
GLW_LIB_NAME = libGLw.a
|
||||||
OSMESA_LIB_NAME = libOSMesa.a
|
OSMESA_LIB_NAME = libOSMesa.a
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
|
|
||||||
|
@@ -1,17 +1,9 @@
|
|||||||
# Configuration for generic Linux, making static libs
|
# Configuration for generic Linux, making static libs
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux
|
||||||
|
|
||||||
CONFIG_NAME = linux-static
|
CONFIG_NAME = linux-static
|
||||||
|
|
||||||
# Compiler and flags
|
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
|
|
||||||
CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
MKLIB_OPTIONS = -static
|
MKLIB_OPTIONS = -static
|
||||||
|
|
||||||
# Library names (actual file names)
|
# Library names (actual file names)
|
||||||
@@ -27,4 +19,3 @@ OSMESA_LIB_DEPS =
|
|||||||
GLU_LIB_DEPS =
|
GLU_LIB_DEPS =
|
||||||
GLUT_LIB_DEPS =
|
GLUT_LIB_DEPS =
|
||||||
GLW_LIB_DEPS =
|
GLW_LIB_DEPS =
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
|
|
||||||
|
@@ -1,42 +1,8 @@
|
|||||||
# Configuration for Linux with x86 optimizations
|
# Configuration for Linux with x86 optimizations
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux
|
||||||
|
|
||||||
CONFIG_NAME = linux-x86
|
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_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
|
||||||
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
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
|
|
||||||
|
@@ -1,28 +1,13 @@
|
|||||||
# Configuration for Linux for 64-bit X86 (Opteron)
|
# Configuration for Linux for 64-bit X86 (Opteron)
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux
|
||||||
|
|
||||||
CONFIG_NAME = linux-x86-64
|
CONFIG_NAME = linux-x86-64
|
||||||
|
|
||||||
# Compiler and flags
|
ARCH_FLAGS = -m64
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -m64 -Wall -O3 -std=c99 -pedantic -fPIC -D_REENTRANT -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DUSE_X86_64_ASM
|
|
||||||
|
|
||||||
CXXFLAGS = -m64 -Wall -O3 -fPIC -D_REENTRANT -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86-64_SOURCES)
|
ASM_SOURCES = $(X86-64_SOURCES)
|
||||||
|
ASM_FLAGS = -DUSE_X86_64_ASM
|
||||||
|
|
||||||
LIB_DIR = $(TOP)/lib64
|
LIB_DIR = $(TOP)/lib64
|
||||||
|
EXTRA_LIB_PATH = -L/usr/X11R6/lib64
|
||||||
|
|
||||||
# Library/program dependencies
|
|
||||||
GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
|
|
||||||
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
|
|
||||||
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
|
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
|
|
||||||
|
@@ -1,28 +1,7 @@
|
|||||||
# Configuration for Linux for 64-bit X86 (Opteron)
|
# Configuration for Linux for 64-bit X86 (Opteron)
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux-x86-64
|
||||||
|
|
||||||
CONFIG_NAME = linux-x86-64-debug
|
CONFIG_NAME = linux-x86-64-debug
|
||||||
|
|
||||||
# Compiler and flags
|
DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -g -m64 -Wall -O3 -std=c99 -pedantic -fPIC -D_REENTRANT -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DUSE_X86_64_ASM -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
|
|
||||||
|
|
||||||
CXXFLAGS = -g -m64 -Wall -O3 -ansi -pedantic -fPIC -D_REENTRANT -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
|
|
||||||
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86-64_SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
LIB_DIR = $(TOP)/lib64
|
|
||||||
|
|
||||||
|
|
||||||
# Library/program dependencies
|
|
||||||
GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
|
|
||||||
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
|
|
||||||
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
|
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
|
|
||||||
|
@@ -1,22 +1,11 @@
|
|||||||
# Configuration for Linux for 64-bit X86 (Opteron), static libs
|
# Configuration for Linux for 64-bit X86 (Opteron), static libs
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux-x86-64
|
||||||
|
|
||||||
CONFIG_NAME = linux-x86-64-static
|
CONFIG_NAME = linux-x86-64-static
|
||||||
|
|
||||||
# Compiler and flags
|
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
|
|
||||||
|
|
||||||
CXXFLAGS = -m64 -Wall -O3 -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
MKLIB_OPTIONS = -static
|
MKLIB_OPTIONS = -static
|
||||||
|
|
||||||
|
|
||||||
# Library names (actual file names)
|
# Library names (actual file names)
|
||||||
GL_LIB_NAME = libGL.a
|
GL_LIB_NAME = libGL.a
|
||||||
GLU_LIB_NAME = libGLU.a
|
GLU_LIB_NAME = libGLU.a
|
||||||
@@ -24,17 +13,9 @@ GLUT_LIB_NAME = libglut.a
|
|||||||
GLW_LIB_NAME = libGLw.a
|
GLW_LIB_NAME = libGLw.a
|
||||||
OSMESA_LIB_NAME = libOSMesa.a
|
OSMESA_LIB_NAME = libOSMesa.a
|
||||||
|
|
||||||
|
|
||||||
#ASM_SOURCES = $(X86_SOURCES)
|
|
||||||
|
|
||||||
|
|
||||||
LIB_DIR = $(TOP)/lib64
|
|
||||||
|
|
||||||
|
|
||||||
# Library/program dependencies (static libs don't have dependencies)
|
# Library/program dependencies (static libs don't have dependencies)
|
||||||
GL_LIB_DEPS =
|
GL_LIB_DEPS =
|
||||||
OSMESA_LIB_DEPS =
|
OSMESA_LIB_DEPS =
|
||||||
GLU_LIB_DEPS =
|
GLU_LIB_DEPS =
|
||||||
GLUT_LIB_DEPS =
|
GLUT_LIB_DEPS =
|
||||||
GLW_LIB_DEPS =
|
GLW_LIB_DEPS =
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
|
|
||||||
|
@@ -5,6 +5,5 @@ include $(TOP)/configs/linux-x86
|
|||||||
|
|
||||||
CONFIG_NAME = linux-x86-debug
|
CONFIG_NAME = linux-x86-debug
|
||||||
|
|
||||||
CFLAGS = -Wall -g -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
|
OPT_FLAGS = -g
|
||||||
|
DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
|
||||||
CXXFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
|
@@ -1,22 +1,11 @@
|
|||||||
# Configuration for Linux with x86 optimizations, static libs
|
# Configuration for Linux with x86 optimizations, static libs
|
||||||
|
|
||||||
include $(TOP)/configs/default
|
include $(TOP)/configs/linux-x86
|
||||||
|
|
||||||
CONFIG_NAME = linux-x86-static
|
CONFIG_NAME = linux-x86-static
|
||||||
|
|
||||||
# Compiler and flags
|
|
||||||
CC = gcc
|
|
||||||
CXX = g++
|
|
||||||
|
|
||||||
CFLAGS = -Wall -O3 -ansi -pedantic -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
|
|
||||||
|
|
||||||
CXXFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
||||||
|
|
||||||
GLUT_CFLAGS = -fexceptions
|
|
||||||
|
|
||||||
MKLIB_OPTIONS = -static
|
MKLIB_OPTIONS = -static
|
||||||
|
|
||||||
|
|
||||||
# Library names (actual file names)
|
# Library names (actual file names)
|
||||||
GL_LIB_NAME = libGL.a
|
GL_LIB_NAME = libGL.a
|
||||||
GLU_LIB_NAME = libGLU.a
|
GLU_LIB_NAME = libGLU.a
|
||||||
@@ -24,14 +13,9 @@ GLUT_LIB_NAME = libglut.a
|
|||||||
GLW_LIB_NAME = libGLw.a
|
GLW_LIB_NAME = libGLw.a
|
||||||
OSMESA_LIB_NAME = libOSMesa.a
|
OSMESA_LIB_NAME = libOSMesa.a
|
||||||
|
|
||||||
|
|
||||||
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
|
|
||||||
|
|
||||||
|
|
||||||
# Library/program dependencies (static libs don't have dependencies)
|
# Library/program dependencies (static libs don't have dependencies)
|
||||||
GL_LIB_DEPS =
|
GL_LIB_DEPS =
|
||||||
OSMESA_LIB_DEPS =
|
OSMESA_LIB_DEPS =
|
||||||
GLU_LIB_DEPS =
|
GLU_LIB_DEPS =
|
||||||
GLUT_LIB_DEPS =
|
GLUT_LIB_DEPS =
|
||||||
GLW_LIB_DEPS =
|
GLW_LIB_DEPS =
|
||||||
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
|
|
||||||
|
Reference in New Issue
Block a user