From de54c5b749b3eefb75d420840c889533a58aa342 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 24 Jul 2013 14:25:51 +0200
Subject: 64-bit compilation now compiles and runs

---
 xorg-server/makefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'xorg-server/makefile')

diff --git a/xorg-server/makefile b/xorg-server/makefile
index 02c2d3e86..b963ad1b4 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -51,22 +51,14 @@ load_makefile $(NOSERVLIBDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(D
 
 OBJS = dix\$(OBJDIR)\main.obj
 
+LINKLIBS += $(PTHREADLIB) $(FREETYPELIB) $(OPENSSLLIB)
+
 ifeq ($(DEBUG),1)
 TTYAPP=vcxsrv
 APP:=$(TTYAPP)
-
-LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype2501MT_D.lib \
-            $(MHMAKECONF)\pthreads\pthreadVC2d.lib
-
 else
 WINAPP=vcxsrv
 APP:=$(WINAPP)
-
-LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
-            $(MHMAKECONF)\freetype\lib\freetype2501MT.lib \
-            $(MHMAKECONF)\pthreads\pthreadVC2.lib
-
 endif
 
 RCINCLUDES += include hw\xwin $(MHMAKECONF)\include $(MHMAKECONF)
@@ -100,10 +92,16 @@ load_makefile $(EXTRASTOBUILDDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG
 all: $(EXTRASTOBUILD)
 
 load_makefile ..\mesalib\windows\VC8\mesa\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+ifdef IS64
+TARGETDIR=x64
+else
+TARGETDIR=Win32
+endif
+
 ifeq ($(DEBUG),1)
-all: ..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll
+all: ..\mesalib\windows\VC8\mesa\$(TARGETDIR)\Debug\swrast_dri.dll
 else
-all: ..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll
+all: ..\mesalib\windows\VC8\mesa\$(TARGETDIR)\Release\swrast_dri.dll
 endif
 
 all: fonts.src\all xkeyboard-config\all
-- 
cgit v1.2.3