Mercurial Mercurial > hg > stx-libview2 / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make.proto
changeset 3231 71227186d2cc
parent 3199 75390367bc8b
child 3238 2d877646264b 
--- a/Make.proto	Fri Sep 06 00:25:37 2013 +0200
+++ b/Make.proto	Fri Sep 06 00:25:39 2013 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.153 2013-07-23 15:38:05 stefan Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.154 2013-09-05 22:25:39 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= $(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview
+LOCALINCLUDES=$(JPEG_INCLUDE) -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libbasic
 
 
 # if you need any additional defines for embedded C code,
@@ -87,9 +87,9 @@
 	    echo; \
 	    echo "prelinking JPEGReader with libjpeg ..."; \
 	    echo; \
-	    echo $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
+	    echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
 	    mv JPEGReader.$(O) __JPEGReader.$(O) && \
-	    $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
+	    ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
 	    rm -f __JPEGReader.$(O); \
 	    echo; \
 	fi
@@ -205,6 +205,7 @@
 $(OUTDIR)ValueModel.$(O) ValueModel.$(H): ValueModel.st $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)VisualComponent.$(O) VisualComponent.$(H): VisualComponent.st $(INCLUDE_TOP)/stx/libview2/DisplayObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)AlignmentOrigin.$(O) AlignmentOrigin.$(H): AlignmentOrigin.st $(INCLUDE_TOP)/stx/libview2/LayoutOrigin.$(H) $(INCLUDE_TOP)/stx/libview2/Layout.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ApplicationWithFileHistory.$(O) ApplicationWithFileHistory.$(H): ApplicationWithFileHistory.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)BlockValue.$(O) BlockValue.$(H): BlockValue.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)FlyByHelp.$(O) FlyByHelp.$(H): FlyByHelp.st $(INCLUDE_TOP)/stx/libview2/ActiveHelp.$(H) $(INCLUDE_TOP)/stx/libview2/EventListener.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)IndirectValue.$(O) IndirectValue.$(H): IndirectValue.st $(INCLUDE_TOP)/stx/libview2/ValueModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
hg/stx-libview2