Skip to content
Snippets Groups Projects
Commit eadb76b3 authored by David Nusinow's avatar David Nusinow
Browse files

Bump to latest mesa in Debian

parent b3f7313a
No related branches found
No related tags found
No related merge requests found
Showing with 286 additions and 167 deletions
......@@ -55,11 +55,14 @@ $(TOP)/configs/current:
# Rules to set/install a specific build configuration
aix \
aix-64 \
aix-64-static \
aix-gcc \
aix-static \
beos \
darwin \
darwin-static \
darwin-static-x86ppc \
darwin-x86ppc \
freebsd \
freebsd-dri \
freebsd-dri-amd64 \
......@@ -72,6 +75,8 @@ hpux11-32-static \
hpux11-32-static-nothreads \
hpux11-64 \
hpux11-64-static \
hpux11-ia64 \
hpux11-ia64-static \
hpux9 \
hpux9-gcc \
irix6-64 \
......@@ -93,6 +98,8 @@ linux-dri-xcb \
linux-indirect \
linux-fbdev \
linux-glide \
linux-ia64-icc \
linux-ia64-icc-static \
linux-icc \
linux-icc-static \
linux-osmesa16 \
......@@ -119,14 +126,21 @@ linux-x86-static \
netbsd \
openbsd \
osf1 \
osf1-static \
solaris-x86 \
solaris-x86-gcc \
solaris-x86-gcc-static \
sunos4 \
sunos4-gcc \
sunos4-static \
sunos5 \
sunos5-gcc \
sunos5-64-gcc \
sunos5-smp \
sunos5-v8 \
sunos5-v8-static \
sunos5-v9 \
sunos5-v9-static \
ultrix-gcc:
(cd configs && rm -f current && ln -s $@ current)
$(MAKE) default
......@@ -134,10 +148,10 @@ ultrix-gcc:
# Rules for making release tarballs
DIRECTORY = Mesa-6.5
LIB_NAME = MesaLib-6.5
DEMO_NAME = MesaDemos-6.5
GLUT_NAME = MesaGLUT-6.5
DIRECTORY = Mesa-6.5.1
LIB_NAME = MesaLib-6.5.1
DEMO_NAME = MesaDemos-6.5.1
GLUT_NAME = MesaGLUT-6.5.1
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
......
......@@ -5,7 +5,7 @@
# Improvements/fixes are welcome.
# Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
# Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
......@@ -36,6 +36,7 @@ DEPS=""
LINK=""
CPLUSPLUS=0
STATIC=0
DLOPEN=0
INSTALLDIR="."
ARCH="auto"
ARCHOPT=""
......@@ -64,6 +65,7 @@ do
echo ' Not observed on all systems at this time.'
echo ' -cplusplus link with C++ runtime'
echo ' -static make a static library (default is dynamic/shared)'
echo ' -dlopen make a shared library suitable for dynamic loading'
echo ' -install DIR put resulting library file(s) in DIR'
echo ' -arch ARCH override using `uname` to determine host system'
echo ' -archopt OPT specify an extra achitecture-specific option OPT'
......@@ -104,6 +106,9 @@ do
'-static')
STATIC=1
;;
'-dlopen')
DLOPEN=1
;;
'-install')
shift 1;
INSTALLDIR=$1
......@@ -175,7 +180,7 @@ fi
#
case $ARCH in
'Linux' | 'OpenBSD')
'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
# we assume gcc
if [ "x$LINK" = "x" ] ; then
......@@ -209,18 +214,22 @@ case $ARCH in
elif [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}" # prefix with "lib"
echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
rm -f ${LIBNAME}.a
ar -ru ${LIBNAME}.a ${OBJECTS}
LINK="ar"
OPTS="-ru"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
ranlib ${LIBNAME}.a
# finish up
FINAL_LIBS=${LIBNAME}.a
else
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $ARCH = 'Linux' ] ; then
case $ARCH in 'Linux' | 'GNU' | GNU/*)
OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
else
;;
*)
OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
fi
;;
esac
if [ $EXPORTS ] ; then
#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
# Make the 'exptmp' file for --version-script option
......@@ -276,9 +285,7 @@ case $ARCH in
else
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making SunOS shared library: " ${LIBNAME}
# XXX OPTS for gcc should be -shared, but that doesn't work.
# Using -G does work though.
OPTS="-G"
if [ "x$LINK" = "x" ] ; then
# -linker was not specified, choose default linker now
if [ $CPLUSPLUS = 1 ] ; then
......@@ -298,7 +305,34 @@ case $ARCH in
LINK="ld"
fi
fi
echo "mklib: linker is" ${LINK} ${OPTS}
# linker options
if [ ${LINK} = "ld" -o ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
# SunOS tools, -G to make shared libs
OPTS="-G"
else
# gcc linker
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" ] ; then
OPTS="-m32 -shared -Wl,-Bdynamic"
else
OPTS="-m64 -shared -Wl,-Bdynamic"
fi
fi
# Check if objects are SPARC v9
# file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
set ${OBJECTS}
SPARCV9=`file $1 | grep SPARCV9`
if [ "${SPARCV9}" ] ; then
OPTS="${OPTS} -xarch=v9"
fi
# for debug:
#echo "mklib: linker is" ${LINK} ${OPTS}
rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
......@@ -368,26 +402,33 @@ case $ARCH in
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
# XXX we should run 'file' on the first object file to determine
# if it's o32, n32 or 64 format, as we do for Linux above.
if [ $ARCHOPT = "64" ] ; then
# 64-bit ABI
OPTS="-64 -shared -all"
echo "mklib: Making IRIX 64-bit shared library: " ${LIBNAME}
elif [ $ARCHOPT = "o32" ] ; then
# old 32-bit ABI
# examine first object to determine ABI
set ${OBJECTS}
ABI_O32=`file $1 | grep 'ELF 32-bit'`
ABI_N32=`file $1 | grep 'ELF N32'`
ABI_N64=`file $1 | grep 'ELF 64-bit'`
if [ "${ABI_O32}" ] ; then
OPTS="-32 -shared -all"
echo "mklib: Making IRIX o32-bit shared library: " ${LIBNAME}
else
# new 32-bit ABI
ABI="o32-bit"
elif [ "${ABI_N32}" ] ; then
OPTS="-n32 -shared -all"
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
ABI="n32-bit"
elif [ "${ABI_N64}" ] ; then
OPTS="-64 -shared -all"
ABI="64-bit"
else
echo "Error: Unexpected IRIX ABI!"
exit 1
fi
if [ $CPLUSPLUS = 1 ] ; then
LINK="CC"
else
LINK="ld"
fi
echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
fi
......@@ -409,6 +450,10 @@ case $ARCH in
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
# HP uses a .2 for their current GL/GLU libraries
if [ ${LIBNAME} = "GL" -o ${LIBNAME} = "GLU" ] ; then
MAJOR=2
fi
RUNLIB="lib${LIBNAME}.${MAJOR}"
DEVLIB="lib${LIBNAME}.sl"
echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
......@@ -418,26 +463,27 @@ case $ARCH in
fi
;;
'AIX' | 'AIX64')
if [ $ARCH = "AIX64" ] ; then
'AIX' )
# examine first object to determine ABI
set ${OBJECTS}
ABI_64=`file $1 | grep '64-bit'`
if [ "${ABI_64}" ] ; then
X64="-X64"
Q64="-q64"
OFILE=shr_64.o
else
OFILE=shr.o #Want to be consistent with the IBM libGL.a
fi
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX static library: " ${LIBNAME}
ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
EXPFILE="lib${LIBNAME}.exp"
OFILE=shr.o #Want to be consistent with the IBM libGL.a
LIBNAME="lib${LIBNAME}.a" # shared objects are still stored in the .a libraries
if [ $ARCH = "AIX64" ] ; then
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry -q64"
else
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry"
fi
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry ${Q64}"
rm -f ${EXPFILE} ${OFILE}
NM="/bin/nm -eC ${X64}"
echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
......@@ -455,8 +501,16 @@ case $ARCH in
}
}
}' | sort -u >> ${EXPFILE}
cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
ar ${X64} -r ${LIBNAME} ${OFILE}
# On AIX a shared library is linked differently when
# you want to dlopen the file
if [ $DLOPEN = "1" ] ; then
cc -G ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
else
cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
ar ${X64} -r ${LIBNAME} ${OFILE}
fi
FINAL_LIBS="${LIBNAME}"
fi
;;
......@@ -498,23 +552,46 @@ case $ARCH in
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making Darwin static library: " ${LIBNAME}
LINK="ar"
OPTS="-ruv"
OPTS="-ruvs"
${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
# may need these:
# CFLAGS += -fno-common
# LDFLAGS += -bundle -flat_namespace -undefined suppress
LIBNAME="lib${LIBNAME}.dylib"
echo "mklib: Making Darwin shared library: " ${LIBNAME}
FLAGS="-dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0"
# On Darwin a .bundle is used for a library that you want to dlopen
if [ $DLOPEN = "1" ] ; then
LIBSUFFIX="bundle"
OPTS="${ARCHOPT} -bundle -multiply_defined suppress"
else
LIBSUFFIX="dylib"
OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
fi
LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
# examine first object to determine ABI
set ${OBJECTS}
ABI_PPC=`file $1 | grep 'object ppc'`
ABI_I386=`file $1 | grep 'object i386'`
if [ "${ABI_PPC}" ] ; then
OPTS="${OPTS} -arch ppc"
fi
if [ "${ABI_I386}" ] ; then
OPTS="${OPTS} -arch i386"
fi
# XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
# to OPTS here?
# determine linker
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="cc"
fi
${LINK} ${FLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
echo "mklib: Making Darwin shared library: " ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME} ${LINKNAME}
FINAL_LIBS="${LIBNAME} ${LINKNAME}"
fi
;;
......@@ -556,7 +633,7 @@ case $ARCH in
FINAL_LIBS="${LIBNAME}"
;;
'icc')
'icc' | 'icc-istatic')
# Intel C compiler
# This should get merged into the Linux code, above, since this isn't
# really a different architecture.
......@@ -571,12 +648,16 @@ case $ARCH in
# finish up
FINAL_LIBS="${LIBNAME}.a"
else
OPTS="-shared"
if [ $ARCH = icc-istatic ] ; then
OPTS="-shared -i-static -cxxlib-icc"
else
OPTS="-shared"
fi
VERSION="${MAJOR}.${MINOR}.${PATCH}"
echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
if [ $CPLUSPLUS = 1 ] ; then
LINK="icc"
LINK="icpc"
else
LINK="icc"
fi
......
/hpux10/1.1/Fri Mar 26 15:16:35 2004//
/hpux10-gcc/1.1/Fri Mar 26 15:16:35 2004//
/hpux11-32-static/1.1/Fri Mar 26 15:16:35 2004//
/hpux11-32-static-nothreads/1.1/Fri Mar 26 15:16:35 2004//
/hpux11-64-static/1.1/Fri Mar 26 15:16:35 2004//
/hpux9/1.1/Fri Mar 26 15:16:35 2004//
/hpux9-gcc/1.1/Fri Mar 26 15:16:35 2004//
/linux-osmesa16/1.1/Fri Mar 26 15:16:35 2004//
/linux-osmesa16-static/1.1/Fri Mar 26 15:16:35 2004//
/linux-osmesa32/1.1/Fri Mar 26 15:16:35 2004//
/netbsd/1.1/Fri Mar 26 15:16:35 2004//
/sunos4/1.1/Fri Mar 26 15:16:35 2004//
/sunos4-gcc/1.1/Fri Mar 26 15:16:35 2004//
/aix-static/1.1/Thu Jul 1 15:32:51 2004//
/aix/1.3/Sat Oct 2 22:34:50 2004//
/aix-64/1.2/Fri Oct 1 16:29:39 2004//
/darwin-static/1.2/Sat Oct 2 22:34:50 2004//
/hpux10-static/1.2/Sat Oct 2 22:34:50 2004//
/hpux11-32/1.1/Fri Oct 1 20:18:42 2004//
/hpux11-64/1.1/Fri Oct 1 20:18:42 2004//
/irix6-64/1.3/Sat Oct 2 22:34:50 2004//
/irix6-64-static/1.3/Sat Oct 2 22:34:50 2004//
/irix6-n32/1.3/Sat Oct 2 22:34:50 2004//
/irix6-n32-static/1.3/Sat Oct 2 22:34:50 2004//
/irix6-o32/1.3/Sat Oct 2 22:34:50 2004//
/irix6-o32-static/1.3/Sat Oct 2 22:34:50 2004//
/linux-alpha/1.2/Sat Oct 2 22:34:50 2004//
/linux-alpha-static/1.2/Sat Oct 2 22:34:50 2004//
/linux-glide/1.3/Sat Oct 2 22:34:50 2004//
/linux-sparc5/1.3/Sat Oct 2 22:34:50 2004//
/linux-ultrasparc/1.2/Sat Oct 2 22:34:50 2004//
/openbsd/1.2/Sat Oct 2 22:34:50 2004//
/solaris-x86-gcc/1.2/Sat Oct 2 22:34:50 2004//
/sunos4-static/1.2/Sat Oct 2 22:34:50 2004//
/sunos5/1.2/Sat Oct 2 22:34:50 2004//
/sunos5-smp/1.2/Sat Oct 2 22:34:50 2004//
/ultrix-gcc/1.2/Sat Oct 2 22:34:50 2004//
/osf1/1.3/Tue Nov 23 16:07:45 2004//
/linux-fbdev/1.2/Sat May 7 16:30:50 2005//
/solaris-x86/1.2/Mon Jun 20 18:26:35 2005//
/linux-ppc/1.3/Fri Jul 15 22:18:52 2005//
/linux-ppc-static/1.3/Fri Jul 15 22:18:52 2005//
/linux-static/1.3/Fri Jul 15 22:18:52 2005//
/linux-x86-32/1.4/Fri Jul 15 22:18:52 2005//
/linux-x86-64-static/1.6/Fri Jul 15 22:18:52 2005//
/linux-x86-static/1.5/Fri Jul 15 22:18:52 2005//
/linux-solo-ia64/1.8/Thu Aug 11 14:15:58 2005//
/linux-sparc/1.3/Thu Aug 11 14:15:58 2005//
/linux-dri-ppc/1.3/Fri Aug 19 22:03:05 2005//
/beos/1.6/Mon Sep 12 15:03:11 2005//
/freebsd-dri-amd64/1.3/Mon Sep 12 15:03:11 2005//
/freebsd-dri-x86/1.2/Mon Sep 12 15:03:11 2005//
/linux-directfb/1.2/Mon Sep 12 15:03:11 2005//
/linux-dri-x86/1.12/Mon Sep 12 15:03:11 2005//
/linux-icc/1.4/Mon Sep 12 15:03:11 2005//
/linux-icc-static/1.4/Mon Sep 12 15:03:11 2005//
/linux-solo-x86/1.9/Mon Sep 12 15:03:11 2005//
/linux-x86-64/1.10/Mon Sep 12 15:03:11 2005//
/linux-x86-glide/1.5/Mon Sep 12 15:03:11 2005//
/sunos5-gcc/1.5/Mon Sep 12 15:03:11 2005//
/default/1.22/Mon Sep 19 20:07:49 2005//
/linux/1.6/Fri Oct 28 14:28:10 2005//
/linux-profile/1.2/Sat Nov 12 17:56:59 2005//
/linux-x86-64-debug/1.4/Sat Nov 12 17:56:59 2005//
/linux-x86-debug/1.4/Sat Nov 12 17:56:59 2005//
/darwin/1.4/Tue Dec 6 15:42:31 2005//
/linux-indirect/1.5/Wed Jan 25 15:09:44 2006//
/linux-dri-x86-64/1.20/Tue Feb 7 00:40:29 2006//
/linux-solo/1.23/Tue Feb 7 00:40:29 2006//
/aix-gcc/1.3/Wed Feb 22 17:22:23 2006//
/freebsd/1.5/Tue Mar 14 15:23:14 2006//
/linux-debug/1.9/Thu Mar 30 14:16:30 2006//
/freebsd-dri/1.17/Fri Mar 31 17:29:46 2006//
/linux-dri/1.39/Fri Mar 31 17:29:46 2006//
/linux-dri-xcb/1.2/Fri Mar 31 17:29:46 2006//
/linux-x86/1.7/Fri Mar 31 23:13:45 2006//
D
Mesa/configs
:ext:brianp@cvs.freedesktop.org:/cvs/mesa
:ext:brianp@pdx.freedesktop.org:/cvs/mesa
......@@ -8,8 +8,8 @@ CONFIG_NAME = aix
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3
CXXFLAGS = -O -DAIXV3
CFLAGS = -O -DAIXV3 -DPTHREADS
CXXFLAGS = -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS =
# Library names (actual file names)
......@@ -19,10 +19,10 @@ GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm
GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
......@@ -8,9 +8,9 @@ CONFIG_NAME = aix-64
CC = xlc
CXX = xlC
CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
MKLIB_OPTIONS = -arch AIX64
CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
LIB_DIR=$(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
......@@ -19,10 +19,9 @@ GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
# Configuration for AIX, static libs
include $(TOP)/configs/default
CONFIG_NAME = aix-64-static
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS = -static
LIB_DIR=$(TOP)/lib64
# 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 = -q64 -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC
......@@ -8,8 +8,8 @@ CONFIG_NAME = aix-static
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3
CXXFLAGS = -O -DAIXV3
CFLAGS = -O -DAIXV3 -DPTHREADS
CXXFLAGS = -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS = -static
# Library names (actual file names)
......@@ -19,5 +19,7 @@ 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
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC
......@@ -5,13 +5,11 @@ include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
CC = c++
CXX = c++
CC = cc
CXX = cc
CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -cplusplus
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
......
......@@ -16,9 +16,9 @@ GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm
# Configuration for Darwin / MacOS X, making static libs
include $(TOP)/configs/darwin
CONFIG_NAME = darwin-static
# Compiler and flags
CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# 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
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm
# Configuration for Darwin / MacOS X, making dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
CC = cc
CXX = cc
CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
GLUT_LIB_NAME = libglut.dylib
GLW_LIB_NAME = libGLw.dylib
OSMESA_LIB_NAME = libOSMesa.dylib
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
GLU_LIB_DEPS = -L$(LIB_DIR) -lGL
GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
SRC_DIRS = mesa glu glut/glx
......@@ -5,7 +5,7 @@ CONFIG_NAME = debian
CC = cc
CXX = c++
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS `pkg-config --cflags x11 xext`
DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall -fPIC -std=c99
......@@ -18,5 +18,5 @@ CXXFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CXXFLAGS) $(DEBIAN_OPT_CFLA
GLW_SOURCES += GLwMDrawA.c
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -lXm
GL_LIB_DEPS = `pkg-config --libs x11 xext` -lm -lpthread
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) `pkg-config --libs x11 xt` -lXm
include $(TOP)/configs/debian-debug
CONFIG_NAME = debian-debug-i386
DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
......@@ -2,11 +2,11 @@ include $(TOP)/configs/debian
CONFIG_NAME = debian-dri
DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"/usr/lib/dri\"
DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = `pkg-config --libs x11 xext xxf86vm` -lm -lpthread -ldl $(LIBDRM_LIB)
USING_EGL=0
......@@ -22,4 +22,12 @@ endif
DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb
DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
ifeq ($(DEB_HOST_ARCH),i386)
DRI_DIRS += i810 i915 sis ffb unichrome
endif
ifeq ($(DEB_HOST_ARCH),amd64)
DRI_DIRS += i915
endif
include $(TOP)/configs/debian_i386
include $(TOP)/configs/debian-dri
CONFIG_NAME = debian-dri-i386
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome
include $(TOP)/configs/debian-i386
CONFIG_NAME = debian-glide-i386
DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment