From 3934efe28c70b1c21a60f38fe726a935c15f4e99 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 13 Apr 2012 14:06:05 +0100
Subject: sigh, need a 64bit zlib too on windows, reverting

---
 zlib/prj/build.lst   |  5 ++---
 zlib/prj/d.lst       | 11 +++++++++++
 zlib/prj/makefile.mk |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 zlib/prj/makefile.mk

(limited to 'zlib/prj')

diff --git a/zlib/prj/build.lst b/zlib/prj/build.lst
index 2eb61b40f5c7..8ef73d94723a 100644
--- a/zlib/prj/build.lst
+++ b/zlib/prj/build.lst
@@ -1,3 +1,2 @@
-cl	zlib : soltools NULL
-cl	zlib			usr1	-   all	zl_mkout NULL
-cl	zlib\prj		nmake	-   all	zl_prj NULL
+zl	zlib	:	soltools NULL
+zl	zlib						nmake	-	all	zl_mkout NULL
diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst
index e69de29bb2d1..ef40caf49c44 100644
--- a/zlib/prj/d.lst
+++ b/zlib/prj/d.lst
@@ -0,0 +1,11 @@
+mkdir: %_DEST%\inc\external\zlib
+mkdir: %_DEST%\lib\x64
+
+..\%__SRC%\inc\patched\zlib.h %_DEST%\inc\external\zlib\zlib.h
+..\%__SRC%\inc\zconf.h %_DEST%\inc\external\zlib\zconf.h
+
+..\%__SRC%\lib\libzlib.a %_DEST%\lib\libzlib.a
+..\%__SRC%\slb\zlib.lib %_DEST%\lib\zlib.lib
+..\%__SRC%\slb\zlib.lin %_DEST%\lib\zlib.lin
+..\%__SRC%\slb\x64\zlib.lib %_DEST%\lib\x64\zlib.lib
+..\%__SRC%\slb\x64\zlib.lin %_DEST%\lib\x64\zlib.lin
diff --git a/zlib/prj/makefile.mk b/zlib/prj/makefile.mk
deleted file mode 100644
index 0997622e00f6..000000000000
--- a/zlib/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk
-- 
cgit