aboutsummaryrefslogtreecommitdiff
path: root/pthreads
diff options
context:
space:
mode:
Diffstat (limited to 'pthreads')
-rwxr-xr-xpthreads/Makefile4
-rwxr-xr-xpthreads/common.mk10
2 files changed, 10 insertions, 4 deletions
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 = \