diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
tree | 950d062f9e183873d64b06e212568a3b0968bb58 /zlib/prj | |
parent | WaE: declaration of 'rand' shadows a global declaration (diff) | |
download | core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.tar.gz core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.zip |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'zlib/prj')
-rw-r--r-- | zlib/prj/build.lst | 5 | ||||
-rw-r--r-- | zlib/prj/d.lst | 11 | ||||
-rw-r--r-- | zlib/prj/makefile.mk | 1 |
3 files changed, 4 insertions, 13 deletions
diff --git a/zlib/prj/build.lst b/zlib/prj/build.lst index 8ef73d94723a..2eb61b40f5c7 100644 --- a/zlib/prj/build.lst +++ b/zlib/prj/build.lst @@ -1,2 +1,3 @@ -zl zlib : soltools NULL -zl zlib nmake - all zl_mkout NULL +cl zlib : soltools NULL +cl zlib usr1 - all zl_mkout NULL +cl zlib\prj nmake - all zl_prj NULL diff --git a/zlib/prj/d.lst b/zlib/prj/d.lst index ef40caf49c44..e69de29bb2d1 100644 --- a/zlib/prj/d.lst +++ b/zlib/prj/d.lst @@ -1,11 +0,0 @@ -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 new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/zlib/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk |