diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-14 14:13:00 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-14 14:13:00 +0000 |
commit | 6bef5e7621023d3e72298a3afdc528ba500d5166 (patch) | |
tree | d576c911d6f8422d7bf11c8fef2e17b2911b66e4 /configs | |
parent | 9326962f065e8728104e7218f5ef25a5ed958789 (diff) |
Don't have to pass ABI-related flags to mklib anymore.
Diffstat (limited to 'configs')
-rw-r--r-- | configs/darwin-static-x86ppc | 2 | ||||
-rw-r--r-- | configs/darwin-x86ppc | 2 | ||||
-rw-r--r-- | configs/irix6-64 | 1 | ||||
-rw-r--r-- | configs/irix6-64-static | 2 | ||||
-rw-r--r-- | configs/irix6-n32 | 1 | ||||
-rw-r--r-- | configs/irix6-n32-static | 2 | ||||
-rw-r--r-- | configs/irix6-o32 | 1 | ||||
-rw-r--r-- | configs/irix6-o32-static | 2 | ||||
-rw-r--r-- | configs/sunos5-v9 | 4 | ||||
-rw-r--r-- | configs/sunos5-v9-static | 2 |
10 files changed, 8 insertions, 11 deletions
diff --git a/configs/darwin-static-x86ppc b/configs/darwin-static-x86ppc index 79415a3a37..844a1d2ead 100644 --- a/configs/darwin-static-x86ppc +++ b/configs/darwin-static-x86ppc @@ -9,7 +9,7 @@ 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 "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" +MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" # Library names (actual file names) GL_LIB_NAME = libGL.a diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc index b8b5acc4ef..6006af2340 100644 --- a/configs/darwin-x86ppc +++ b/configs/darwin-x86ppc @@ -12,7 +12,7 @@ CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \ 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 "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" +MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk" # Library names (actual file names) GL_LIB_NAME = libGL.dylib diff --git a/configs/irix6-64 b/configs/irix6-64 index df2d1426a4..a794627ba9 100644 --- a/configs/irix6-64 +++ b/configs/irix6-64 @@ -9,7 +9,6 @@ CC = cc CXX = CC CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS -MKLIB_OPTIONS = -archopt 64 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/irix6-64-static b/configs/irix6-64-static index e3d78558c9..8e264412b8 100644 --- a/configs/irix6-64-static +++ b/configs/irix6-64-static @@ -9,7 +9,7 @@ CC = cc CXX = CC CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS -MKLIB_OPTIONS = -archopt 64 -static +MKLIB_OPTIONS = -static GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/irix6-n32 b/configs/irix6-n32 index 32def6a0a2..d42aa77484 100644 --- a/configs/irix6-n32 +++ b/configs/irix6-n32 @@ -9,7 +9,6 @@ CC = cc CXX = CC CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS -MKLIB_OPTIONS = -archopt n32 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static index 0458590f0d..74db411216 100644 --- a/configs/irix6-n32-static +++ b/configs/irix6-n32-static @@ -9,7 +9,7 @@ CC = cc CXX = CC CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS -MKLIB_OPTIONS = -archopt n32 -static +MKLIB_OPTIONS = -static GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/irix6-o32 b/configs/irix6-o32 index 56a1979603..f26c988a99 100644 --- a/configs/irix6-o32 +++ b/configs/irix6-o32 @@ -9,7 +9,6 @@ CC = cc CXX = CC CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666 -MKLIB_OPTIONS = -archopt o32 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static index ec51b9cdc5..468f67489d 100644 --- a/configs/irix6-o32-static +++ b/configs/irix6-o32-static @@ -9,7 +9,7 @@ CC = cc CXX = CC CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666 -MKLIB_OPTIONS = -archopt o32 -static +MKLIB_OPTIONS = -static GLW_SOURCES = GLwDrawA.c GLwMDrawA.c diff --git a/configs/sunos5-v9 b/configs/sunos5-v9 index 68a746cb87..11f263a45b 100644 --- a/configs/sunos5-v9 +++ b/configs/sunos5-v9 @@ -1,10 +1,10 @@ -# Configuration for SunOS 5 +# Configuration for SunOS 5, SPARC V9 include $(TOP)/configs/default CONFIG_NAME = sunos5-v9 -MKLIB_OPTIONS = -archopt SUNV9 -cplusplus +MKLIB_OPTIONS = -cplusplus LIB_DIR = $(TOP)/lib64 diff --git a/configs/sunos5-v9-static b/configs/sunos5-v9-static index 264b23cd6d..8cf4b63661 100644 --- a/configs/sunos5-v9-static +++ b/configs/sunos5-v9-static @@ -1,4 +1,4 @@ -# Configuration for SunOS 5 +# Configuration for SunOS 5, SPARC V9, static libs include $(TOP)/configs/default |