diff options
| author | José Fonseca <[email protected]> | 2007-09-19 23:43:36 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2007-09-19 23:48:07 +0100 |
| commit | 83a674a7af4e58f677a56aae2111d2cbdbf1e21d (patch) | |
| tree | 056866d017701b3418522852978ee7912fd2b83c /configs | |
| parent | a0e948f3aaadf56ab206a6b3e597825f2085f6d1 (diff) | |
Update linux-profile config.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/linux-profile | 27 | ||||
| -rw-r--r-- | configs/linux-static | 3 |
2 files changed, 5 insertions, 25 deletions
diff --git a/configs/linux-profile b/configs/linux-profile index 75b245779af..3efdcf5e057 100644 --- a/configs/linux-profile +++ b/configs/linux-profile @@ -1,29 +1,8 @@ # Configuration for profiling on Linux with gprof -include $(TOP)/configs/default +include $(TOP)/configs/linux-static CONFIG_NAME = linux-profile -# Compiler and flags -CC = gcc -CXX = g++ - -CFLAGS = -pg -O -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 - -CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG - -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$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11 - -# Need to make static libs for profiling: -MKLIB_OPTIONS = -static -GL_LIB_NAME = lib$(GL_LIB).a -GLU_LIB_NAME = lib$(GLU_LIB).a -GLUT_LIB_NAME = lib$(GLUT_LIB).a -GLW_LIB_NAME = lib$(GLW_LIB).a -OSMESA_LIB_NAME = lib$(OSMesa).a -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread +OPT_FLAGS = -pg -g -O2 -DNDEBUG +DEFINES += -DNDEBUG diff --git a/configs/linux-static b/configs/linux-static index 85141ea643f..d5fbe9cf651 100644 --- a/configs/linux-static +++ b/configs/linux-static @@ -21,6 +21,7 @@ GLUT_LIB_DEPS = GLW_LIB_DEPS = # Need to specify all libraries we may need -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \ +APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \ + -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group -lm \ -L/usr/X11R6/lib/ -lX11 -lXmu -lXi -lpthread |