Changed library paths for new structure

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/png/makefile.bcc b/src/png/makefile.bcc
index e373ab64bbf817326e002dead5b613e96a4a130d..efd3c07795a722d4cdfc8d4a60d810ac83bab9e3 100644 (file)
--- 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)
 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
 
 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 = \
 # Dependency List
 #
 Dep_winpng = \

-       ..\..\..\lib\winpng.lib
+       ..\..\lib\winpng.lib

 
 winpng : BccW16.cfg $(Dep_winpng)
   echo MakeNode winpng
 
 winpng : BccW16.cfg $(Dep_winpng)
   echo MakeNode winpng

diff --git a/src/png/makefile.dos b/src/png/makefile.dos
index 514dc14c503bba181919fb2de69312c92a50f172..bbea801c4d2f326527e9c92109ace68a081168dd 100644 (file)
--- a/src/png/makefile.dos
+++ b/src/png/makefile.dos
@@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include
 
 WINPNGDIR = $(WXDIR)\utils\imatest\png
 WINPNGINC = $(WINPNGDIR)
 
 WINPNGDIR = $(WXDIR)\utils\imatest\png
 WINPNGINC = $(WINPNGDIR)

-WINPNGLIB = ..\..\..\lib\winpng.lib
+WINPNGLIB = ..\..\lib\winpng.lib

 
 INC = /I..\zlib
 
 
 INC = /I..\zlib
 

diff --git a/src/png/makefile.nt b/src/png/makefile.nt
index 5e53a15a41da132f373b44df918cf090f03fb92a..4973db4f38a7dfe484e4b67166b5e42f3052e2f5 100644 (file)
--- a/src/png/makefile.nt
+++ b/src/png/makefile.nt
@@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)

-WINPNGLIB = ..\..\..\lib\winpng.lib
+WINPNGLIB = ..\..\lib\winpng.lib

 
 INC = /I..\zlib
 
 
 INC = /I..\zlib
 

diff --git a/src/zlib/makefile.b32 b/src/zlib/makefile.b32
index bca4e9037014113c4e07371500c48c2cdab83b9b..e45999b188e969da23088a25002599e79d890ddb 100644 (file)
--- a/src/zlib/makefile.b32
+++ b/src/zlib/makefile.b32
@@ -21,7 +21,7 @@ LIB=tlib
 LDFLAGS= $(MODEL)
 O=.obj
 
 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) \
 
 # 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 207aaeb80f22ecf989f84c6bd2d0cd0d714f789e..ab0304c547d8afa978521875bf895dc71b4d4aa8 100644 (file)
--- a/src/zlib/makefile.nt
+++ b/src/zlib/makefile.nt
@@ -18,7 +18,7 @@ LIB=tlib
 LDFLAGS=$(MODEL)
 O=.obj
 
 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) \
 
 # 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 0bce2f20b330176735075c28adec6c2fc80d5acf..e8ee232db440486835005d78aacdff56aa47c804 100644 (file)
--- a/src/zlib/makefile.wat
+++ b/src/zlib/makefile.wat
@@ -19,7 +19,7 @@ LD=wcl386
 LIB=wlib -b -c 
 LDFLAGS= 
 O=.obj
 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) 
 
 # variables
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O)