From 58c55d1f77ce79bc8fd2a3738551da1e191c6005 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 22 May 1998 08:08:11 +0000 Subject: [PATCH] Changed library paths for new structure git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/png/makefile.bcc | 4 ++-- src/png/makefile.dos | 2 +- src/png/makefile.nt | 2 +- src/zlib/makefile.b32 | 2 +- src/zlib/makefile.nt | 2 +- src/zlib/makefile.wat | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/png/makefile.bcc b/src/png/makefile.bcc index e373ab64bb..efd3c07795 100644 --- a/src/png/makefile.bcc +++ b/src/png/makefile.bcc @@ -24,7 +24,7 @@ BLATW16_winpngdlib = LEAT_winpngdlib = $(LLATW16_winpngdlib) REAT_winpngdlib = $(RLATW16_winpngdlib) BEAT_winpngdlib = $(BLATW16_winpngdlib) -ZLIB=..\..\..\lib\zlib.lib +ZLIB=..\..\lib\zlib.lib LOBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj\ pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj @@ -32,7 +32,7 @@ LOBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj\ # Dependency List # Dep_winpng = \ - ..\..\..\lib\winpng.lib + ..\..\lib\winpng.lib winpng : BccW16.cfg $(Dep_winpng) echo MakeNode winpng diff --git a/src/png/makefile.dos b/src/png/makefile.dos index 514dc14c50..bbea801c4d 100644 --- a/src/png/makefile.dos +++ b/src/png/makefile.dos @@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include WINPNGDIR = $(WXDIR)\utils\imatest\png WINPNGINC = $(WINPNGDIR) -WINPNGLIB = ..\..\..\lib\winpng.lib +WINPNGLIB = ..\..\lib\winpng.lib INC = /I..\zlib diff --git a/src/png/makefile.nt b/src/png/makefile.nt index 5e53a15a41..4973db4f38 100644 --- a/src/png/makefile.nt +++ b/src/png/makefile.nt @@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include WINPNGDIR = ..\png WINPNGINC = $(WINPNGDIR) -WINPNGLIB = ..\..\..\lib\winpng.lib +WINPNGLIB = ..\..\lib\winpng.lib INC = /I..\zlib diff --git a/src/zlib/makefile.b32 b/src/zlib/makefile.b32 index bca4e90370..e45999b188 100644 --- a/src/zlib/makefile.b32 +++ b/src/zlib/makefile.b32 @@ -21,7 +21,7 @@ LIB=tlib LDFLAGS= $(MODEL) O=.obj -LIBTARGET=..\..\..\lib\zlib.lib +LIBTARGET=..\..\lib\zlib.lib # variables OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ diff --git a/src/zlib/makefile.nt b/src/zlib/makefile.nt index 207aaeb80f..ab0304c547 100644 --- a/src/zlib/makefile.nt +++ b/src/zlib/makefile.nt @@ -18,7 +18,7 @@ LIB=tlib LDFLAGS=$(MODEL) O=.obj -LIBTARGET=..\..\..\lib\zlib.lib +LIBTARGET=..\..\lib\zlib.lib # variables OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ diff --git a/src/zlib/makefile.wat b/src/zlib/makefile.wat index 0bce2f20b3..e8ee232db4 100644 --- a/src/zlib/makefile.wat +++ b/src/zlib/makefile.wat @@ -19,7 +19,7 @@ LD=wcl386 LIB=wlib -b -c LDFLAGS= O=.obj -LIBTARGET=..\..\..\lib\zlib.lib +LIBTARGET=..\..\lib\zlib.lib # variables OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) -- 2.45.2