diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-27 12:35:33 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-27 12:35:33 +1100 |
| commit | a556034514582dc8e1b8b65f56020031d513331b (patch) | |
| tree | 182aaf4be24733e2943f9e39cfb86bc22f942efb /configs | |
| parent | 9043323f1437f9c6791845b3ddbb9af912b45110 (diff) | |
| parent | b717de3238a028a3fdfbaf13eb02dbde262f03e7 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default | 13 | ||||
| -rw-r--r-- | configs/linux-cell | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/configs/default b/configs/default index 92fc743ab4..166205a1d3 100644 --- a/configs/default +++ b/configs/default @@ -18,6 +18,7 @@ DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags CC = cc CXX = CC +HOST_CC = $(CC) CFLAGS = -O CXXFLAGS = -O GLU_CFLAGS = @@ -68,12 +69,12 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos # Library/program dependencies #EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 -APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread +OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) +GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm +GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm +GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 +APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm diff --git a/configs/linux-cell b/configs/linux-cell index 2551530f31..4f0086cc1f 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -6,14 +6,15 @@ CONFIG_NAME = linux-cell # Compiler and flags -CC = /usr/bin/ppu32-gcc -CXX = /usr/bin/ppu32-g++ +CC = ppu32-gcc +CXX = ppu32-g++ +HOST_CC = gcc # Cell SDK location SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr -CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -DGALLIUM_CELL +CFLAGS = -g -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL CXXFLAGS = $(CFLAGS) @@ -31,14 +32,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \ ### SPU stuff -SPU_CC = /usr/bin/spu-gcc +SPU_CC = spu-gcc SPU_CFLAGS = -g -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/ SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -SPU_AR = /usr/bin/ar +SPU_AR = ppu-ar SPU_AR_FLAGS = -qcs -SPU_EMBED = /usr/bin/embedspu +SPU_EMBED = ppu32-embedspu SPU_EMBED_FLAGS = -m32 |