diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 /pthreads/Makefile | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
Diffstat (limited to 'pthreads/Makefile')
| -rw-r--r-- | pthreads/Makefile | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pthreads/Makefile b/pthreads/Makefile index a28ea4aad..1faac14e3 100644 --- a/pthreads/Makefile +++ b/pthreads/Makefile @@ -45,8 +45,14 @@ VSEFLAGSD = $(CFLAGSD) VCFLAGS = $(CFLAGS) VCFLAGSD= $(CFLAGSD) +!ifdef DEBUG +OUTDIR=obj_d +!else +OUTDIR=obj +!endif + DLL_INLINED_OBJS = \ - pthread.obj \ + $(OUTDIR)\pthread.obj \ version.res # Aggregate modules for inlinability @@ -439,7 +445,7 @@ VC-static: @ nmake /nologo EHFLAGS="$(OPTIM) $(VCFLAGS) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VER).static VC-static-debug: - @ nmake /nologo EHFLAGS="$(OPTIMD) $(VCFLAGSD) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VERD).static + @ nmake /nologo DEBUG=1 EHFLAGS="$(OPTIMD) $(VCFLAGSD) /DPTW32_BUILD_INLINED /DPTW32_STATIC_LIB" CLEANUP=__CLEANUP_C pthreadVC$(DLL_VERD).static realclean: clean if exist pthread*.dll del pthread*.dll @@ -469,18 +475,24 @@ $(DLLS): $(DLL_OBJS) /link /nodefaultlib:libcmt /implib:$*.lib \ msvcrt.lib wsock32.lib /out:$@ -$(INLINED_STAMPS): $(DLL_INLINED_OBJS) +$(INLINED_STAMPS): $(OUTDIR) $(DLL_INLINED_OBJS) cl /LDd /Zi /nologo $(DLL_INLINED_OBJS) \ /link /nodefaultlib:libcmt /implib:$*.lib \ msvcrt.lib wsock32.lib /out:$*.dll -$(STATIC_STAMPS): $(DLL_INLINED_OBJS) +$(STATIC_STAMPS): $(OUTDIR) $(DLL_INLINED_OBJS) if exist $*.lib del $*.lib lib $(DLL_INLINED_OBJS) /out:$*.lib - + +$(OUTDIR): + mkdir $(OUTDIR) + .c.obj: cl $(EHFLAGS) /D$(CLEANUP) -c $< +.c{$(OUTDIR)}.obj: + cl $(EHFLAGS) /D$(CLEANUP) -Fo"$@" -c $< + .rc.res: rc /dPTW32_RC_MSC /d$(CLEANUP) $< |