Changed library paths for new structure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,7 +24,7 @@ BLATW16_winpngdlib =
|
|||||||
LEAT_winpngdlib = $(LLATW16_winpngdlib)
|
LEAT_winpngdlib = $(LLATW16_winpngdlib)
|
||||||
REAT_winpngdlib = $(RLATW16_winpngdlib)
|
REAT_winpngdlib = $(RLATW16_winpngdlib)
|
||||||
BEAT_winpngdlib = $(BLATW16_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\
|
LOBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj\
|
||||||
pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.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
|
# Dependency List
|
||||||
#
|
#
|
||||||
Dep_winpng = \
|
Dep_winpng = \
|
||||||
..\..\..\lib\winpng.lib
|
..\..\lib\winpng.lib
|
||||||
|
|
||||||
winpng : BccW16.cfg $(Dep_winpng)
|
winpng : BccW16.cfg $(Dep_winpng)
|
||||||
echo MakeNode winpng
|
echo MakeNode winpng
|
||||||
|
@@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include
|
|||||||
|
|
||||||
WINPNGDIR = $(WXDIR)\utils\imatest\png
|
WINPNGDIR = $(WXDIR)\utils\imatest\png
|
||||||
WINPNGINC = $(WINPNGDIR)
|
WINPNGINC = $(WINPNGDIR)
|
||||||
WINPNGLIB = ..\..\..\lib\winpng.lib
|
WINPNGLIB = ..\..\lib\winpng.lib
|
||||||
|
|
||||||
INC = /I..\zlib
|
INC = /I..\zlib
|
||||||
|
|
||||||
|
@@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include
|
|||||||
|
|
||||||
WINPNGDIR = ..\png
|
WINPNGDIR = ..\png
|
||||||
WINPNGINC = $(WINPNGDIR)
|
WINPNGINC = $(WINPNGDIR)
|
||||||
WINPNGLIB = ..\..\..\lib\winpng.lib
|
WINPNGLIB = ..\..\lib\winpng.lib
|
||||||
|
|
||||||
INC = /I..\zlib
|
INC = /I..\zlib
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@ LIB=tlib
|
|||||||
LDFLAGS= $(MODEL)
|
LDFLAGS= $(MODEL)
|
||||||
O=.obj
|
O=.obj
|
||||||
|
|
||||||
LIBTARGET=..\..\..\lib\zlib.lib
|
LIBTARGET=..\..\lib\zlib.lib
|
||||||
|
|
||||||
# variables
|
# variables
|
||||||
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
||||||
|
@@ -18,7 +18,7 @@ LIB=tlib
|
|||||||
LDFLAGS=$(MODEL)
|
LDFLAGS=$(MODEL)
|
||||||
O=.obj
|
O=.obj
|
||||||
|
|
||||||
LIBTARGET=..\..\..\lib\zlib.lib
|
LIBTARGET=..\..\lib\zlib.lib
|
||||||
|
|
||||||
# variables
|
# variables
|
||||||
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
|
||||||
|
@@ -19,7 +19,7 @@ LD=wcl386
|
|||||||
LIB=wlib -b -c
|
LIB=wlib -b -c
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
O=.obj
|
O=.obj
|
||||||
LIBTARGET=..\..\..\lib\zlib.lib
|
LIBTARGET=..\..\lib\zlib.lib
|
||||||
|
|
||||||
# variables
|
# variables
|
||||||
OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O)
|
OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O)
|
||||||
|
Reference in New Issue
Block a user