From 48addd68a8c8d0c026be2d3b87ea6ce23509da91 Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 23 Sep 2005 02:59:15 +0000 Subject: * Replaced lots of __linux__ || __FreeBSD__ with __GNUC__ * MinGW port now uses asm versions of SnapVector and ftol * Improved the handling of mangled symbols in vm_x86.c git-svn-id: svn://svn.icculus.org/quake3/trunk@99 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/unix/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'code/unix') diff --git a/code/unix/Makefile b/code/unix/Makefile index 09bc04f..fc37d09 100644 --- a/code/unix/Makefile +++ b/code/unix/Makefile @@ -261,7 +261,6 @@ ifeq ($(PLATFORM),mingw32) ARFLAGS=rv RANLIB=ranlib - THREAD_LDFLAGS=-lpthread LDFLAGS= -mwindows -lwsock32 -lgdi32 -lwinmm -lole32 GLLDFLAGS= @@ -626,7 +625,6 @@ Q3OBJ = \ ifeq ($(ARCH),i386) Q3OBJ += $(B)/client/vm_x86.o endif - ifeq ($(ARCH),x86) Q3OBJ += $(B)/client/vm_x86.o endif @@ -673,6 +671,8 @@ ifeq ($(PLATFORM),mingw32) $(B)/client/linux_common.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ + $(B)/client/ftola.o \ + $(B)/client/snapvectora.o \ $(B)/client/win_gamma.o \ $(B)/client/win_glimp.o \ $(B)/client/win_input.o \ -- cgit v1.2.3