diff -r fd10b8c8eacf -r f733925f01c6 stx_libview2.st --- a/stx_libview2.st Thu Jan 11 18:09:17 2007 +0100 +++ b/stx_libview2.st Thu Jan 11 19:05:34 2007 +0100 @@ -60,6 +60,21 @@ !stx_libview2 class methodsFor:'description - compilation'! +additionalDefinitions_bc_dot_mak + ^ ' +# see stdHeader_bc for LIBVIEW2_BASE +# LIBVIEW2_BASE =0x61800000 +LIB_BASE_LD_ARG=-b:$(LIBVIEW2_BASE) + +LIBJPEG_DIR=$(TOP)\support\libjpeg-6a +LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib +CLOCAL_INCL=-I"$(LIBJPEG_DIR)" +LOCALLIBS=$(LIBJPEG) +' + + "Created: / 22-08-2006 / 23:58:05 / cg" +! + additionalDefinitions_make_dot_proto ^ ' NT_ADDITIONAL_DEFS:: @@ -80,19 +95,19 @@ "Created: / 22-08-2006 / 23:50:57 / cg" ! -additionalDefinitions_nt_dot_mak +additionalRules_bc_dot_mak ^ ' -# see stdHeader_nt for LIBVIEW2_BASE -# LIBVIEW2_BASE =0x61800000 -LIB_BASE_LD_ARG=-b:$(LIBVIEW2_BASE) +$(LIBJPEG): + cd $(LIBJPEG_DIR) + bmake + cd ..\..\libview2 -LIBJPEG_DIR=$(TOP)\support\libjpeg-6a -LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib -CLOCAL_INCL=-I"$(LIBJPEG_DIR)" -LOCALLIBS=$(LIBJPEG) +$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h + +$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG) ' - "Created: / 22-08-2006 / 23:58:05 / cg" + "Created: / 22-08-2006 / 23:58:29 / cg" ! additionalRules_make_dot_proto @@ -138,19 +153,12 @@ "Created: / 22-08-2006 / 23:58:51 / cg" ! -additionalRules_nt_dot_mak - ^ ' -$(LIBJPEG): - cd $(LIBJPEG_DIR) - bmake - cd ..\..\libview2 +additionalTargets_bc_dot_mak + "additional targets to be added to the nt.mak file." -$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h + ^ '$(LIBJPEG)' -$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG) -' - - "Created: / 22-08-2006 / 23:58:29 / cg" + "Created: / 23-08-2006 / 00:01:19 / cg" ! additionalTargets_make_dot_proto @@ -161,14 +169,6 @@ "Created: / 22-08-2006 / 23:54:37 / cg" ! -additionalTargets_nt_dot_mak - "additional targets to be added to the nt.mak file." - - ^ '$(LIBJPEG)' - - "Created: / 23-08-2006 / 00:01:19 / cg" -! - stcOptimizationOptions ^ '+optspace2 -warnNonStandard' @@ -314,5 +314,5 @@ !stx_libview2 class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.15 2006-10-10 20:11:22 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.16 2007-01-11 18:05:34 stefan Exp $' ! !