From: <re...@us...> - 2006-06-17 17:11:45
|
Revision: 24638 Author: res2002 Date: 2006-06-17 10:11:31 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/crystal/?rev=24638&view=rev Log Message: ----------- res fixed msvcgen.jam to use the "common" directory to generate the relative path for icon resources, not the version-specific one. Modified Paths: -------------- CS/trunk/docs/history.txt CS/trunk/mk/jam/msvcgen.jam Modified: CS/trunk/docs/history.txt =================================================================== --- CS/trunk/docs/history.txt 2006-06-17 16:19:47 UTC (rev 24637) +++ CS/trunk/docs/history.txt 2006-06-17 17:11:31 UTC (rev 24638) @@ -11,6 +11,8 @@ - AndyDude changed the non-error CoreAudio messages to be not so 'loud'. The two CoreAudio messages that I changed were Report()'d at very high severity levels, when it wasn't really that severe. + - res fixed msvcgen.jam to use the "common" directory to generate + the relative path for icon resources, not the version-specific one. 15-Jun-2006 - thebolt fixed a bug in csQuaternion which caused matrix to quaternion to go wrong. Modified: CS/trunk/mk/jam/msvcgen.jam =================================================================== --- CS/trunk/mk/jam/msvcgen.jam 2006-06-17 16:19:47 UTC (rev 24637) +++ CS/trunk/mk/jam/msvcgen.jam 2006-06-17 17:11:31 UTC (rev 24638) @@ -675,6 +675,11 @@ local sources = $(4) ; local options = $(5) ; local relpath = [ Property msvcgen : relpath$(MSVC_VERSION) ] ; + local relpathcommon = [ Property msvcgen : relpathcommon ] ; + if "$(relpathcommon)" = "" + { + relpathcommon = $(relpath) ; + } local outdir = [ Property msvcgen : outdir$(MSVC_VERSION) ] ; local outdircommon = [ Property msvcgen : outdircommon ] ; if "$(outdircommon)" = "" @@ -827,8 +832,7 @@ { local iconrc = $(resource:S=.iconrctmp) ; # RELPATH includes trailing slash (hence the "" in ConcatDirs). - RELPATH on $(iconrc) = - [ ConcatDirs [ Property msvcgen : relpath$(MSVC_VERSION) ] "" ] ; + RELPATH on $(iconrc) = [ ConcatDirs $(relpathcommon) "" ] ; MakeLocate $(iconrc) : $(workdircommon) ; Depends $(iconrc) : $(icon) ; Depends $(iconrc) : $(SUBDIR)/Jamfile ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |