diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-07-01 15:32:51 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-07-01 15:32:51 +0000 |
| commit | 6d50d91ae4cd741a17b9b024725f5fbe19729b51 (patch) | |
| tree | 1c29840c563ba7c3f9624724d806819b8bc72c58 | |
| parent | 3d38361b718d490e1e7fda64519952ec887cd149 (diff) | |
added aix-static config, make aix config build dynamic libs
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | configs/aix | 14 | ||||
| -rw-r--r-- | configs/aix-static | 23 |
3 files changed, 36 insertions, 5 deletions
@@ -11,6 +11,9 @@ default: $(TOP)/configs/current done +doxygen: + (cd doxygen ; make) ; \ + clean: @for dir in $(SUBDIRS) ; do \ (cd $$dir ; $(MAKE) clean) ; \ @@ -43,6 +46,7 @@ $(TOP)/configs/current: # Rules to set/install a specific build configuration aix \ aix-gcc \ +aix-static \ darwin \ darwin-static \ freebsd \ diff --git a/configs/aix b/configs/aix index 0deccfd8be..1335f409df 100644 --- a/configs/aix +++ b/configs/aix @@ -1,4 +1,4 @@ -# Configuration for AIX +# Configuration for AIX, dynamic libs include $(TOP)/configs/default @@ -6,12 +6,11 @@ CONFIG_NAME = aix # Compiler and flags CC = cc -# XXX fix this: -CXX = c++ +CXX = xlC CFLAGS = -O -DAIXV3 CXXFLAGS = -O -DAIXV3 -MKLIB_OPTIONS = -static +MKLIB_OPTIONS = # Library names (actual file names) GL_LIB_NAME = libGL.a @@ -20,5 +19,10 @@ GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a -APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm +GL_LIB_DEPS = -lX11 -lXext -lm +GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm -lC +GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lXi -lXmu -lX11 -lm +GLW_LIB_DEPS = -L$(TOP)/lib -lGL -lXt -lX11 +OSMESA_LIB_DEPS = -L$(TOP)/lib -lGL +APP_LIB_DEPS = -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm -lC diff --git a/configs/aix-static b/configs/aix-static new file mode 100644 index 0000000000..f6f086edb6 --- /dev/null +++ b/configs/aix-static @@ -0,0 +1,23 @@ +# Configuration for AIX, static libs + +include $(TOP)/configs/default + +CONFIG_NAME = aix-static + +# Compiler and flags +CC = cc +CXX = xlC + +CFLAGS = -O -DAIXV3 +CXXFLAGS = -O -DAIXV3 +MKLIB_OPTIONS = -static + +# Library names (actual file names) +GL_LIB_NAME = libGL.a +GLU_LIB_NAME = libGLU.a +GLUT_LIB_NAME = libglut.a +GLW_LIB_NAME = libGLw.a +OSMESA_LIB_NAME = libOSMesa.a + +APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm + |