diff -r e4c8832d1500 -r 061d98b4acbd nt.mak --- a/nt.mak Fri Nov 21 16:39:44 2003 +0100 +++ b/nt.mak Fri Nov 21 21:04:17 2003 +0100 @@ -8,10 +8,9 @@ # !INCLUDE $(TOP)\rules\stdHeader_nt # -MODULE=stx -MODULE_DIR=libtool2 -PACKAGE=$(MODULE):$(MODULE_DIR) -LIBNAME=libtool2 +!INCLUDE Make.spec +# + LIB_BASE_LD_ARG=$(LIBTOOL2_BASE_LD_ARG) STCOPT="-warnNonStandard" STCLOCALOPT=-package=$(PACKAGE) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME) @@ -19,29 +18,8 @@ ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll - -OBJS=\ - $(OUTDIR)ColorMenu.$(O) \ - $(OUTDIR)FontMenu.$(O) \ - $(OUTDIR)MenuEditor.$(O) \ - $(OUTDIR)ImageEditor.$(O) \ - $(OUTDIR)DataSetBuilder.$(O) \ - $(OUTDIR)UIGalleryView.$(O) \ - $(OUTDIR)UIHelpTool.$(O) \ - $(OUTDIR)UILayoutTool.$(O) \ - $(OUTDIR)UIObjectView.$(O) \ - $(OUTDIR)UIPainter.$(O) \ - $(OUTDIR)UIPainterView.$(O) \ - $(OUTDIR)UISelectionPanel.$(O) \ - $(OUTDIR)UISpecificationTool.$(O) \ - $(OUTDIR)SelectionBrowser.$(O) \ - $(OUTDIR)FileSelectionBrowser.$(O) \ - $(OUTDIR)ResourceSelectionBrowser.$(O) - - !INCLUDE $(TOP)\rules\stdRules_nt - # BEGINMAKEDEPEND --- do not remove this line; make depend needs it $(OUTDIR)ColorMenu.$(O) ColorMenu.$(H): ColorMenu.st $(STCHDR) $(INCL)MenuPanel.$(H) $(INCL)SimpleView.$(H) $(INCL)DisplaySurface.$(H) $(INCL)GraphicsMedium.$(H) $(INCL)DeviceGraphicsContext.$(H) $(INCL)GraphicsContext.$(H) $(INCL)Object.$(H) $(INCL)SimpleDialog.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H) $(OUTDIR)DataSetBuilder.$(O) DataSetBuilder.$(H): DataSetBuilder.st $(STCHDR) $(INCL)ResourceSpecEditor.$(H) $(INCL)ToolApplicationModel.$(H) $(INCL)ApplicationModel.$(H) $(INCL)Model.$(H) $(INCL)Object.$(H) $(INCL)Array.$(H) $(INCL)ArrayedCollection.$(H) $(INCL)SequenceableCollection.$(H) $(INCL)Collection.$(H)