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>
Fri, 10 Dec 1999 16:58:10 +0100
changeset 1294 d0d29db5f708
parent 1293 4212c567d775
child 1295 d3e0d8dc816d
*** empty log message ***
bc.mak file | annotate | diff | comparison | revisions
nt.mak file | annotate | diff | comparison | revisions 
--- a/bc.mak	Fri Dec 10 16:13:16 1999 +0100
+++ b/bc.mak	Fri Dec 10 16:58:10 1999 +0100
@@ -1,9 +1,11 @@
 #
 # DO NOT EDIT 
 # automatically generated from Make.proto (by make nt.mak)
+# but manually edited for libjpeg (sigh)
 #
-# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.32 1999-12-10 15:13:16 cg Exp $
+# $Header: /cvs/stx/stx/libview2/bc.mak,v 1.33 1999-12-10 15:58:10 cg Exp $
 #
+
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
@@ -14,8 +16,17 @@
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
+LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
+CLOCAL_INCL=-I$(LIBJPEG_DIR)
+LOCALLIBS=$(LIBJPEG)
 
+ALL: $(LIBJPEG) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
+$(LIBJPEG):
+        cd $(LIBJPEG_DIR)
+        make.exe -f makefile.bcc32
+        cd $(TOP)\libview2
 OBJS=\
   $(OUTDIR)ColorValue.$(O) \
   $(OUTDIR)Icon.$(O) \
--- a/nt.mak	Fri Dec 10 16:13:16 1999 +0100
+++ b/nt.mak	Fri Dec 10 16:58:10 1999 +0100
@@ -1,9 +1,11 @@
 #
 # DO NOT EDIT 
 # automatically generated from Make.proto (by make nt.mak)
+# but manually edited for libjpeg (sigh)
 #
-# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.32 1999-12-10 15:13:16 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Attic/nt.mak,v 1.33 1999-12-10 15:58:10 cg Exp $
 #
+
 TOP=..
 #
 !INCLUDE $(TOP)\rules\stdHeader_nt
@@ -14,8 +16,17 @@
 STCLOCALOPT=-package=stx:$(LIBNAME) $(COMMONSYMBOLS) $(SEPINITCODE) $(RELOCINSTVARS) -varPrefix=$(LIBNAME)
 #STCLOCALOPT="-package=stx:libview2 +commonSymbols -varPrefix=libview2"
 
-ALL: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
+LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib
+CLOCAL_INCL=-I$(LIBJPEG_DIR)
+LOCALLIBS=$(LIBJPEG)
 
+ALL: $(LIBJPEG) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+
+$(LIBJPEG):
+        cd $(LIBJPEG_DIR)
+        make.exe -f makefile.bcc32
+        cd $(TOP)\libview2
 OBJS=\
   $(OUTDIR)ColorValue.$(O) \
   $(OUTDIR)Icon.$(O) \
hg/stx-libview2