Mercurial Mercurial > hg > stx-libview2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Sat, 18 Sep 1999 16:26:23 +0200
changeset 1239 3437c4d68992
parent 1238 0fe6566d266c
child 1240 136813cb044b
*** empty log message ***
bc.mak file | annotate | diff | comparison | revisions
nt.mak file | annotate | diff | comparison | revisions 
--- a/bc.mak	Sat Sep 18 16:16:05 1999 +0200
+++ b/bc.mak	Sat Sep 18 16:26:23 1999 +0200
@@ -2,19 +2,28 @@
 # DO NOT EDIT 
 # automatically generated from Make.proto
 #
-# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.26 1999-09-18 14:16:04 cg Exp $
+# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.27 1999-09-18 14:26:23 cg Exp $
 #
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
 #
+LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
+LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
+CLOCAL_INCL=-I$(LIBJPEG_DIR)
+
 LIBNAME=libview2
 LIB_BASE=$(LIBVIEW2_BASE)
 STCOPT="+optspace2 -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+ALL: $(LIBJPEG) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
+$(LIBJPEG):
+	cd $(LIBJPEG_DIR)
+	make.exe -f makefile.bcc32
+	cd $(TOP)\libview2
 
 OBJS=\
   $(OUTDIR)ColorValue.$(O) \
--- a/nt.mak	Sat Sep 18 16:16:05 1999 +0200
+++ b/nt.mak	Sat Sep 18 16:26:23 1999 +0200
@@ -2,19 +2,28 @@
 # DO NOT EDIT 
 # automatically generated from Make.proto
 #
-# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.26 1999-09-18 14:16:04 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.27 1999-09-18 14:26:23 cg Exp $
 #
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
 #
+LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
+LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
+CLOCAL_INCL=-I$(LIBJPEG_DIR)
+
 LIBNAME=libview2
 LIB_BASE=$(LIBVIEW2_BASE)
 STCOPT="+optspace2 -warnNonStandard"
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+ALL: $(LIBJPEG) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
+$(LIBJPEG):
+	cd $(LIBJPEG_DIR)
+	make.exe -f makefile.bcc32
+	cd $(TOP)\libview2
 
 OBJS=\
   $(OUTDIR)ColorValue.$(O) \
hg/stx-libview2