diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-10 21:42:34 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-10 21:42:34 +0000 |
| commit | a7e01a7dc8c7ebd68d019718b8a7c2a20fe517a8 (patch) | |
| tree | a77f3a35d7aceb36c8a2f1cad88bb0130d1e337b /Makefile.nmake | |
| parent | f6a83887d0347bf01f17beb9ae8f74d65d05ed4b (diff) | |
fix some zlib build issues
svn path=/trunk/; revision=20382
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ce93e4dcfa..c0742e458b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -429,14 +429,14 @@ image:: # compile and copy the resulting files back to (source) ZLIB_DIR $(ZLIB_DIR)\zlib1.dll:: !IF "$(MSVC_VARIANT)" != "MSVC6" - xcopy $(ZLIB_DIR) zlib.tmp /D /I /E + xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y cd zlib.tmp - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll + $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR) if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include copy zlib1.dll $(ZLIB_DIR) - if exist copy zlib1.dll.manifest $(ZLIB_DIR) + if exist zlib1.dll.manifest copy zlib1.dll.manifest $(ZLIB_DIR) copy zdll.lib $(ZLIB_DIR)\lib copy zconf.h $(ZLIB_DIR)\include copy zlib.h $(ZLIB_DIR)\include |