*** empty log message ***
authorjames
Wed, 21 Mar 2007 11:43:46 +0100
changeset 1864 4d4f4dec87b1
parent 1863 3e133f1a61cc
child 1865 f86fc871c4e0
*** empty log message ***
bc.mak
--- a/bc.mak	Wed Mar 21 11:33:46 2007 +0100
+++ b/bc.mak	Wed Mar 21 11:43:46 2007 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.88 2007-03-07 16:52:58 fm Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.89 2007-03-21 10:43:46 james Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic2.
@@ -26,7 +26,7 @@
 LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
-LOCALLIBS=$(ZLIB)
+LOCALLIBS=$(ZLIB_DIR)\$(ZLIB)
 
 
 # see stdHeader_bc for LIBBASIC2_BASE
@@ -36,14 +36,14 @@
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL:: $(ZLIB) $(BINDIR)\$(LIBNAME).dll
+ALL:: $(ZLIB_DIR)\$(ZLIB) $(BINDIR)\$(LIBNAME).dll
 
 !INCLUDE $(TOP)\rules\stdRules_bc
 
 
-$(ZLIB):
+$(ZLIB_DIR)\$(ZLIB):
 	cd $(ZLIB_DIR)
-	$(MAKE) $(MAKE_ZLIB_ARG) zlib.lib
+	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
 	cd ..\..\libbasic2
 
 $(BZ2LIB):