diff -r 210f3ac37991 -r 56d86a3ee602 bc.mak --- a/bc.mak Fri Apr 30 13:57:37 2004 +0200 +++ b/bc.mak Mon May 10 13:23:29 2004 +0200 @@ -3,20 +3,91 @@ # automagically generated from Make.proto (by make nt.mak) # TOP=.. - # !INCLUDE $(TOP)\rules\stdHeader_nt # -!INCLUDE Make.spec -# -LIB_BASE_LD_ARG=$(LIBBASIC2_BASE_LD_ARG) +MODULE=stx +MODULE_DIR=libbasic2 +PACKAGE=$(MODULE):$(MODULE_DIR) +LIBNAME=libbasic2 +LIB_BASE=$(LIBBASIC2_BASE) +!ifdef USEBC +LIB_BASE_LD_ARG=-B:$(LIBBASIC2_BASE) +!endif STCOPT="+optspace2 -warnNonStandard" STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME) +#STCLOCALOPT="-package=stx:libbasic2 +commonSymbols -varPrefix=libbasic2 -I../support" ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll +# +# additional defines +# + +OBJS=\ + $(OUTDIR)Base64Coder.$(O) \ + $(OUTDIR)FileSorter.$(O) \ + $(OUTDIR)MappedCollection.$(O) \ + $(OUTDIR)TwoByteString.$(O) \ + $(OUTDIR)Unicode16String.$(O) \ + $(OUTDIR)JISEncodedString.$(O) \ + $(OUTDIR)FourByteString.$(O) \ + $(OUTDIR)Unicode32String.$(O) \ + $(OUTDIR)Polygon.$(O) \ + $(OUTDIR)List.$(O) \ + $(OUTDIR)Queue.$(O) \ + $(OUTDIR)SharedQueue.$(O) \ + $(OUTDIR)CacheDictionary.$(O) \ + $(OUTDIR)CacheDictionaryWithFactory.$(O) \ + $(OUTDIR)RunArray.$(O) \ + $(OUTDIR)Iterator.$(O) \ + $(OUTDIR)OrderedSet.$(O) \ + $(OUTDIR)OrderedDictionary.$(O) \ + $(OUTDIR)Text.$(O) \ + $(OUTDIR)SocketAddress.$(O) \ + $(OUTDIR)IPSocketAddress.$(O) \ + $(OUTDIR)IPv6SocketAddress.$(O) \ + $(OUTDIR)UDSocketAddress.$(O) \ + $(OUTDIR)SocketAddressInfo.$(O) \ + $(OUTDIR)NameLookupError.$(O) \ + $(OUTDIR)ActorStream.$(O) \ + $(OUTDIR)SoundStream.$(O) \ + $(OUTDIR)PrinterStream.$(O) \ + $(OUTDIR)PostscriptPrinterStream.$(O) \ + $(OUTDIR)TextStream.$(O) \ + $(OUTDIR)UnitConverter.$(O) \ + $(OUTDIR)Random.$(O) \ + $(OUTDIR)UnboxedIntegerArray.$(O) \ + $(OUTDIR)WordArray.$(O) \ + $(OUTDIR)SignedWordArray.$(O) \ + $(OUTDIR)IntegerArray.$(O) \ + $(OUTDIR)SignedIntegerArray.$(O) \ + $(OUTDIR)LongIntegerArray.$(O) \ + $(OUTDIR)SignedLongIntegerArray.$(O) \ + $(OUTDIR)ZipArchive.$(O) \ + $(OUTDIR)DirectoryContents.$(O) \ + $(OUTDIR)CachingRegistry.$(O) \ + $(OUTDIR)BooleanArray.$(O) \ + $(OUTDIR)BitArray.$(O) \ + $(OUTDIR)Monitor.$(O) \ + $(OUTDIR)TimeDuration.$(O) \ + $(OUTDIR)Stack.$(O) \ + $(OUTDIR)CompressionStream.$(O) \ + $(OUTDIR)UUID.$(O) \ + $(OUTDIR)URI.$(O) \ + $(OUTDIR)HierarchicalURI.$(O) \ + $(OUTDIR)FileURI.$(O) \ + $(OUTDIR)FtpURI.$(O) \ + $(OUTDIR)HttpURI.$(O) \ + $(OUTDIR)Socket_win32.$(O) \ + + !INCLUDE $(TOP)\rules\stdRules_nt +# +# additional rules +# + # BEGINMAKEDEPEND --- do not remove this line; make depend needs it $(OUTDIR)ActorStream.$(O) ActorStream.$(H): ActorStream.st $(STCHDR) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)AppletalkSocketAddress.$(O) AppletalkSocketAddress.$(H): AppletalkSocketAddress.st $(STCHDR) ../include/SocketAddress.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) @@ -28,6 +99,7 @@ $(OUTDIR)Base64Coder.$(O) Base64Coder.$(H): Base64Coder.st $(STCHDR) ../include/ObjectCoder.$(H) ../include/AbstractObjectCoder.$(H) ../include/Object.$(H) $(OUTDIR)Bezier.$(O) Bezier.$(H): Bezier.st $(STCHDR) ../include/Geometric.$(H) ../include/Object.$(H) $(OUTDIR)Bezier2Segment.$(O) Bezier2Segment.$(H): Bezier2Segment.st $(STCHDR) +$(OUTDIR)BinaryTree.$(O) BinaryTree.$(H): BinaryTree.st $(STCHDR) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)BitArray.$(O) BitArray.$(H): BitArray.st $(STCHDR) ../include/BooleanArray.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)BooleanArray.$(O) BooleanArray.$(H): BooleanArray.st $(STCHDR) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)CRC32Stream.$(O) CRC32Stream.$(H): CRC32Stream.st $(STCHDR) ../include/HashStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) @@ -37,15 +109,19 @@ $(OUTDIR)Circle.$(O) Circle.$(H): Circle.st $(STCHDR) ../include/Geometric.$(H) ../include/Object.$(H) $(OUTDIR)CollectingSharedQueueStream.$(O) CollectingSharedQueueStream.$(H): CollectingSharedQueueStream.st $(STCHDR) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)CompressionStream.$(O) CompressionStream.$(H): CompressionStream.st $(STCHDR) ../include/Stream.$(H) ../include/Object.$(H) +$(OUTDIR)CompressionStreamTest.$(O) CompressionStreamTest.$(H): CompressionStreamTest.st $(STCHDR) $(OUTDIR)Cons.$(O) Cons.$(H): Cons.st $(STCHDR) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) +$(OUTDIR)ConsStream.$(O) ConsStream.$(H): ConsStream.st $(STCHDR) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)Curve.$(O) Curve.$(H): Curve.st $(STCHDR) ../include/Geometric.$(H) ../include/Object.$(H) $(OUTDIR)DecNetSocketAddress.$(O) DecNetSocketAddress.$(H): DecNetSocketAddress.st $(STCHDR) ../include/SocketAddress.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)DirectoryContents.$(O) DirectoryContents.$(H): DirectoryContents.st $(STCHDR) ../include/Object.$(H) $(OUTDIR)EllipticalArc.$(O) EllipticalArc.$(H): EllipticalArc.st $(STCHDR) ../include/Geometric.$(H) ../include/Object.$(H) $(OUTDIR)EpsonFX1PrinterStream.$(O) EpsonFX1PrinterStream.$(H): EpsonFX1PrinterStream.st $(STCHDR) ../include/PrinterStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)ExternalLong.$(O) ExternalLong.$(H): ExternalLong.st $(STCHDR) ../include/ExternalBytes.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) +$(OUTDIR)FileSorter.$(O) FileSorter.$(H): FileSorter.st $(STCHDR) ../include/Object.$(H) $(OUTDIR)FileText.$(O) FileText.$(H): FileText.st $(STCHDR) ../include/StringCollection.$(H) ../include/OrderedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)FileURI.$(O) FileURI.$(H): FileURI.st $(STCHDR) ../include/HierarchicalURI.$(H) ../include/URI.$(H) ../include/Object.$(H) +$(OUTDIR)FourByteString.$(O) FourByteString.$(H): FourByteString.st $(STCHDR) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)FtpURI.$(O) FtpURI.$(H): FtpURI.st $(STCHDR) ../include/HierarchicalURI.$(H) ../include/URI.$(H) ../include/Object.$(H) $(OUTDIR)GBEncodedString.$(O) GBEncodedString.$(H): GBEncodedString.st $(STCHDR) ../include/TwoByteString.$(H) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)HPLjetIIPrinterStream.$(O) HPLjetIIPrinterStream.$(H): HPLjetIIPrinterStream.st $(STCHDR) ../include/PrinterStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) @@ -61,6 +137,7 @@ $(OUTDIR)JISEncodedString.$(O) JISEncodedString.$(H): JISEncodedString.st $(STCHDR) ../include/TwoByteString.$(H) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)KSCEncodedString.$(O) KSCEncodedString.$(H): KSCEncodedString.st $(STCHDR) ../include/TwoByteString.$(H) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)KeyedCollection.$(O) KeyedCollection.$(H): KeyedCollection.st $(STCHDR) ../include/Collection.$(H) ../include/Object.$(H) +$(OUTDIR)KeywordInContextIndexBuilder.$(O) KeywordInContextIndexBuilder.$(H): KeywordInContextIndexBuilder.st $(STCHDR) ../include/Object.$(H) $(OUTDIR)LazyArray.$(O) LazyArray.$(H): LazyArray.st $(STCHDR) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)LazyCons.$(O) LazyCons.$(H): LazyCons.st $(STCHDR) $(OUTDIR)LazyValue.$(O) LazyValue.$(H): LazyValue.st $(STCHDR) @@ -69,7 +146,6 @@ $(OUTDIR)LongIntegerArray.$(O) LongIntegerArray.$(H): LongIntegerArray.st $(STCHDR) ../include/UnboxedIntegerArray.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)MappedCollection.$(O) MappedCollection.$(H): MappedCollection.st $(STCHDR) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)MessageChannel.$(O) MessageChannel.$(H): MessageChannel.st $(STCHDR) ../include/MessageSend.$(H) ../include/Message.$(H) ../include/Object.$(H) -$(OUTDIR)MessageSend.$(O) MessageSend.$(H): MessageSend.st $(STCHDR) ../include/Message.$(H) ../include/Object.$(H) $(OUTDIR)Monitor.$(O) Monitor.$(H): Monitor.st $(STCHDR) ../include/Object.$(H) $(OUTDIR)NameLookupError.$(O) NameLookupError.$(H): NameLookupError.st $(STCHDR) ../include/Error.$(H) ../include/Exception.$(H) ../include/GenericException.$(H) ../include/Object.$(H) $(OUTDIR)NumberSet.$(O) NumberSet.$(H): NumberSet.st $(STCHDR) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) @@ -92,7 +168,6 @@ $(OUTDIR)SignedWordArray.$(O) SignedWordArray.$(H): SignedWordArray.st $(STCHDR) ../include/UnboxedIntegerArray.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)SocketAddress.$(O) SocketAddress.$(H): SocketAddress.st $(STCHDR) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)SocketAddressInfo.$(O) SocketAddressInfo.$(H): SocketAddressInfo.st $(STCHDR) ../include/Object.$(H) -$(OUTDIR)SocketTest.$(O) SocketTest.$(H): SocketTest.st $(STCHDR) $(OUTDIR)Socket.$(O) Socket.$(H): Socket.st $(STCHDR) ../include/NonPositionableExternalStream.$(H) ../include/ExternalStream.$(H) ../include/ReadWriteStream.$(H) ../include/WriteStream.$(H) ../include/PositionableStream.$(H) ../include/PeekableStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)SoundStream.$(O) SoundStream.$(H): SoundStream.st $(STCHDR) ../include/FileStream.$(H) ../include/ExternalStream.$(H) ../include/ReadWriteStream.$(H) ../include/WriteStream.$(H) ../include/PositionableStream.$(H) ../include/PeekableStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)Spline.$(O) Spline.$(H): Spline.st $(STCHDR) ../include/Geometric.$(H) ../include/Object.$(H) @@ -107,6 +182,7 @@ $(OUTDIR)UUID.$(O) UUID.$(H): UUID.st $(STCHDR) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)UnboxedIntegerArray.$(O) UnboxedIntegerArray.$(H): UnboxedIntegerArray.st $(STCHDR) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(STCHDR) ../include/TwoByteString.$(H) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) +$(OUTDIR)Unicode32String.$(O) Unicode32String.$(H): Unicode32String.st $(STCHDR) ../include/FourByteString.$(H) ../include/CharacterArray.$(H) ../include/ByteArray.$(H) ../include/UninterpretedBytes.$(H) ../include/ArrayedCollection.$(H) ../include/SequenceableCollection.$(H) ../include/Collection.$(H) ../include/Object.$(H) $(OUTDIR)UnitConverter.$(O) UnitConverter.$(H): UnitConverter.st $(STCHDR) ../include/Object.$(H) $(OUTDIR)UnixPTYStream.$(O) UnixPTYStream.$(H): UnixPTYStream.st $(STCHDR) ../include/PipeStream.$(H) ../include/NonPositionableExternalStream.$(H) ../include/ExternalStream.$(H) ../include/ReadWriteStream.$(H) ../include/WriteStream.$(H) ../include/PositionableStream.$(H) ../include/PeekableStream.$(H) ../include/Stream.$(H) ../include/Object.$(H) $(OUTDIR)ValueLink.$(O) ValueLink.$(H): ValueLink.st $(STCHDR) ../include/Link.$(H) ../include/Object.$(H) @@ -126,6 +202,7 @@ genAbbrev:: Base64Coder.st genAbbrev:: Bezier.st genAbbrev:: Bezier2Segment.st +genAbbrev:: BinaryTree.st genAbbrev:: BitArray.st genAbbrev:: BooleanArray.st genAbbrev:: CRC32Stream.st @@ -135,15 +212,19 @@ genAbbrev:: Circle.st genAbbrev:: CollectingSharedQueueStream.st genAbbrev:: CompressionStream.st +genAbbrev:: CompressionStreamTest.st genAbbrev:: Cons.st +genAbbrev:: ConsStream.st genAbbrev:: Curve.st genAbbrev:: DecNetSocketAddress.st genAbbrev:: DirectoryContents.st genAbbrev:: EllipticalArc.st genAbbrev:: EpsonFX1PrinterStream.st genAbbrev:: ExternalLong.st +genAbbrev:: FileSorter.st genAbbrev:: FileText.st genAbbrev:: FileURI.st +genAbbrev:: FourByteString.st genAbbrev:: FtpURI.st genAbbrev:: GBEncodedString.st genAbbrev:: HPLjetIIPrinterStream.st @@ -159,6 +240,7 @@ genAbbrev:: JISEncodedString.st genAbbrev:: KSCEncodedString.st genAbbrev:: KeyedCollection.st +genAbbrev:: KeywordInContextIndexBuilder.st genAbbrev:: LazyArray.st genAbbrev:: LazyCons.st genAbbrev:: LazyValue.st @@ -167,7 +249,6 @@ genAbbrev:: LongIntegerArray.st genAbbrev:: MappedCollection.st genAbbrev:: MessageChannel.st -genAbbrev:: MessageSend.st genAbbrev:: Monitor.st genAbbrev:: NameLookupError.st genAbbrev:: NumberSet.st @@ -191,7 +272,6 @@ genAbbrev:: Socket.st genAbbrev:: SocketAddress.st genAbbrev:: SocketAddressInfo.st -genAbbrev:: SocketTest.st genAbbrev:: Socket_win32.st genAbbrev:: SoundStream.st genAbbrev:: Spline.st @@ -206,6 +286,7 @@ genAbbrev:: UUID.st genAbbrev:: UnboxedIntegerArray.st genAbbrev:: Unicode16String.st +genAbbrev:: Unicode32String.st genAbbrev:: UnitConverter.st genAbbrev:: UnixPTYStream.st genAbbrev:: ValueLink.st