diff -r 955c6a3d7764 -r 1168ad8c8c73 stx_libview2.st --- a/stx_libview2.st Wed Oct 12 18:53:09 2011 +0200 +++ b/stx_libview2.st Wed Oct 12 18:53:12 2011 +0200 @@ -42,7 +42,7 @@ ! extensionsVersion_CVS - ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.46 2011-09-27 16:37:28 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.47 2011-10-12 16:53:12 cg Exp $' ! extensionsVersion_SVN @@ -96,7 +96,14 @@ additionalDefinitions_bc_dot_mak ^ ' -LIBJPEG_DIR=$(TOP)\support\libjpeg-6a +!!ifdef USEBC +LIBJPEG=$(LIBJPEG_DIR)\objbc\libjpeg.lib +!!else +!! ifdef USEVC +LIBJPEG=$(LIBJPEG_DIR)\objvc\libjpeg.lib +!! else +!! endif +!!endif LIBJPEG=$(LIBJPEG_DIR)\libjpeg.lib CLOCAL_INCL=-I"$(LIBJPEG_DIR)" ' @@ -368,9 +375,9 @@ !stx_libview2 class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.46 2011-09-27 16:37:28 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.47 2011-10-12 16:53:12 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.46 2011-09-27 16:37:28 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/stx_libview2.st,v 1.47 2011-10-12 16:53:12 cg Exp $' ! !