diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-24 14:25:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 08:25:18 +0200 |
| commit | de54c5b749b3eefb75d420840c889533a58aa342 (patch) | |
| tree | 6502771c9dd5a0d455388734060469b18f2e4011 /pthreads | |
| parent | 0606cba5be2dab08f0b4de540d7b278fa6273daf (diff) | |
| download | vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2 vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip | |
64-bit compilation now compiles and runs
Diffstat (limited to 'pthreads')
| -rwxr-xr-x | pthreads/Makefile | 4 | ||||
| -rwxr-xr-x | pthreads/common.mk | 10 |
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 = \ |