From 24b3361cea084b9038c0f67bf423cd429877fd85 Mon Sep 17 00:00:00 2001 From: tma Date: Tue, 1 Nov 2005 16:05:06 +0000 Subject: * More Solaris work git-svn-id: svn://svn.icculus.org/quake3/trunk@205 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/unix/Makefile | 6 +++--- code/unix/snapvectora.s | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'code/unix') diff --git a/code/unix/Makefile b/code/unix/Makefile index 32a5016..8a01a23 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -418,13 +418,13 @@ ifeq ($(PLATFORM),SunOS) LDFLAGS=-lsocket -lnsl -ldl -lm ifeq ($(strip $(USE_SDL)),true) - GLLDFLAGS=$(shell sdl-config --libs) -lGLU -lX11 -lXext + GLLDFLAGS=$(shell sdl-config --libs) -L/usr/X11/lib -lGLU -lX11 -lXext else - GLLDFLAGS=-L/usr/openwin/$(LIB) -lGLU -lX11 -lXext + GLLDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext endif ifeq ($(ARCH),i386) - # linux32 make ... + # Solarix x86 make ... BASE_CFLAGS += -m32 LDFLAGS+=-m32 endif diff --git a/code/unix/snapvectora.s b/code/unix/snapvectora.s index 0206ce2..63ea3e8 100644 --- a/code/unix/snapvectora.s +++ b/code/unix/snapvectora.s @@ -76,7 +76,7 @@ C(Sys_SnapVector): // void Sys_SnapVectorCW( float *v, unsigned short int cw ) .global C(Sys_SnapVectorCW) -C(Sys_SnapVector_cw): +C(Sys_SnapVectorCW): pushl %eax pushl %ebp movl %esp,%ebp -- cgit v1.2.3