summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-02-14 14:57:04 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-02-14 14:57:04 +0000
commita5033a0421102f65d642c5419bfe10a4d466d023 (patch)
tree2a4306f3e8dce5681f3f27caef49de1b57154dfd
parent2189d9c96e206f2f401069f7b7981782cf71b2ac (diff)
fix AIX issues (bug 5874)
-rwxr-xr-xbin/installmesa2
-rw-r--r--configs/aix-gcc2
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/installmesa b/bin/installmesa
index 8d1ee992dc7..fb68047af8c 100755
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -53,6 +53,8 @@ if [ `uname` = "FreeBSD" ] ; then
CP_FLAGS="-f"
elif [ `uname` = "Darwin" ] ; then
CP_FLAGS="-f"
+elif [ `uname` = "AIX" ] ; then
+ CP_FLAGS="-fh"
else
CP_FLAGS="-fd"
fi
diff --git a/configs/aix-gcc b/configs/aix-gcc
index 5f10bf25dce..cc55551050c 100644
--- a/configs/aix-gcc
+++ b/configs/aix-gcc
@@ -14,6 +14,6 @@ CXXFLAGS = -O2 -DAIXV3
MKLIB_OPTIONS = -arch aix-gcc
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi