--- a/bc.mak Fri Oct 23 14:28:23 2009 +0200
+++ b/bc.mak Fri Oct 23 14:28:25 2009 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview/bc.mak,v 1.74 2009-10-06 07:55:56 cg Exp $
+# $Header: /cvs/stx/stx/libview/bc.mak,v 1.75 2009-10-23 12:28:25 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libview.
@@ -17,6 +17,11 @@
TOP=..
INCLUDE_TOP=$(TOP)\..
+
+# see stdHeader_bc for LIBVIEW_BASE
+LIB_BASE=$(LIBVIEW_BASE)
+
+
!INCLUDE $(TOP)\rules\stdHeader_bc
!INCLUDE Make.spec
@@ -25,9 +30,6 @@
RESFILES=libview.res
-# see stdHeader_bc for LIBVIEW_BASE
-LIB_BASE_LD_ARG=-b:$(LIBVIEW_BASE)
-
!ifdef USEBC
X11_LIBS=..\libbc\X11OMF.lib ..\libbc\XextOMF.lib
@@ -55,9 +57,9 @@
# build all prerequisite packages for this package
prereq:
- pushd ..\libbasic & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\libbasic2 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\librun & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
#
@@ -77,7 +79,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)Border.$(O) Border.$(H): Border.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)AbstractBorder.$(O) AbstractBorder.$(H): AbstractBorder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Color.$(O) Color.$(H): Color.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Colormap.$(O) Colormap.$(H): Colormap.st $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Controller.$(O) Controller.$(H): Controller.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -96,6 +98,7 @@
$(OUTDIR)WindowSensor.$(O) WindowSensor.$(H): WindowSensor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)WindowingTransformation.$(O) WindowingTransformation.$(H): WindowingTransformation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)stx_libview.$(O) stx_libview.$(H): stx_libview.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Border.$(O) Border.$(H): Border.st $(INCLUDE_TOP)\stx\libview\AbstractBorder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ColorPalette.$(O) ColorPalette.$(H): ColorPalette.st $(INCLUDE_TOP)\stx\libview\Colormap.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Depth16Image.$(O) Depth16Image.$(H): Depth16Image.st $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Depth1Image.$(O) Depth1Image.$(H): Depth1Image.st $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -109,6 +112,7 @@
$(OUTDIR)DeviceGraphicsContext.$(O) DeviceGraphicsContext.$(H): DeviceGraphicsContext.st $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Font.$(O) Font.$(H): Font.st $(INCLUDE_TOP)\stx\libview\FontDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)HostGraphicsDevice.$(O) HostGraphicsDevice.$(H): HostGraphicsDevice.st $(INCLUDE_TOP)\stx\libview\GraphicsDevice.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SimpleBorder.$(O) SimpleBorder.$(H): SimpleBorder.st $(INCLUDE_TOP)\stx\libview\AbstractBorder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SynchronousWindowSensor.$(O) SynchronousWindowSensor.$(H): SynchronousWindowSensor.st $(INCLUDE_TOP)\stx\libview\WindowSensor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ViewStyle.$(O) ViewStyle.$(H): ViewStyle.st $(INCLUDE_TOP)\stx\libview\ResourcePack.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)WindowEvent.$(O) WindowEvent.$(H): WindowEvent.st $(INCLUDE_TOP)\stx\libview\Event.$(H) $(INCLUDE_TOP)\stx\libbasic\MessageSend.$(H) $(INCLUDE_TOP)\stx\libbasic\Message.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)