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

---
 pthreads/Makefile  |  4 ++--
 pthreads/common.mk | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'pthreads')

diff --git a/pthreads/Makefile b/pthreads/Makefile
index 7be1c2829..bd8e82662 100755
--- a/pthreads/Makefile
+++ b/pthreads/Makefile
@@ -222,12 +222,12 @@ $(DLLS): $(DLL_OBJS)
 
 $(INLINED_STATIC_STAMPS): $(OUTDIR) $(DLL_OBJS)
 	if exist $*.lib del $*.lib
-	lib /LTCG $(DLL_OBJS) /out:$*.lib
+	lib /LTCG $(DLL_OBJS) /out:$*$(SUFFIX).lib
 	echo. >$@
 
 $(SMALL_STATIC_STAMPS): $(OUTDIR) $(STATIC_OBJS)
 	if exist $*.lib del $*.lib
-	lib /LTCG $(STATIC_OBJS) /out:$*.lib
+	lib /LTCG $(STATIC_OBJS) /out:$*$(SUFFIX).lib
 	echo. >$@
 
 $(OUTDIR):
diff --git a/pthreads/common.mk b/pthreads/common.mk
index 3594a36cc..86ac3f706 100755
--- a/pthreads/common.mk
+++ b/pthreads/common.mk
@@ -1,8 +1,14 @@
 # Common makefile definitions
+!ifdef IS64
+SUFFIX=64
+!else
+SUFFIX=
+!endif
+
 !ifdef DEBUG
-OUTDIR=obj_d
+OUTDIR=obj$(SUFFIX)_d
 !else
-OUTDIR=obj
+OUTDIR=obj$(SUFFIX)
 !endif
 
 RESOURCE_OBJS	= \
-- 
cgit v1.2.3