Update of /cvsroot/adobe-source/sandbox/adobe-source/third_party/boost_tp/adobe
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6755/third_party/boost_tp/adobe
Modified Files:
boost_1_33_1_patch_01.txt patch_boost.sh
Log Message:
asl 1.0.13
Index: boost_1_33_1_patch_01.txt
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/third_party/boost_tp/adobe/boost_1_33_1_patch_01.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** boost_1_33_1_patch_01.txt 24 Jan 2006 19:38:52 -0000 1.3
--- boost_1_33_1_patch_01.txt 3 Feb 2006 18:33:41 -0000 1.4
***************
*** 152,183 ****
flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ;
}
- diff -ruN boost_1_33_1/tools/build/v2/tools/msvc.jam boost/tools/build/v2/tools/msvc.jam
- --- boost_1_33_1/tools/build/v2/tools/msvc.jam 2005-07-15 06:35:58.000000000 -0700
- +++ boost/tools/build/v2/tools/msvc.jam 2006-01-05 16:10:50.000000000 -0800
- @@ -164,7 +164,25 @@
- {
- flags msvc.compile CFLAGS $(condition)/<optimization>speed : /Ogity /O2 /Gs ;
- flags msvc.compile CFLAGS $(condition)/<optimization>space : /Ogisy /O1 /Gs ;
- - }
- + }
- +
- + #
- + # ADOBE : This change allows for a version to be set inside the RC
- + # compiler so we can include version-dependent manifest files
- + #
- +
- + if ! [ MATCH ^([67].*) : $(version) ]
- + {
- + flags msvc.compile.rc DEFINES : "ADOBE_VER=8 " ;
- + }
- + else
- + {
- + flags msvc.compile.rc DEFINES : "ADOBE_VER=7 " ;
- + }
- +
- + #
- + # ADOBE : End changes
- + #
- }
-
- rule default-paths ( version ? )
--- 152,153 ----
Index: patch_boost.sh
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/third_party/boost_tp/adobe/patch_boost.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** patch_boost.sh 6 Jan 2006 18:03:07 -0000 1.5
--- patch_boost.sh 3 Feb 2006 18:33:41 -0000 1.6
***************
*** 8,18 ****
if [ ! -d boost_1_33_1 ]; then
! echo "You must have a source directory (boost_1_33_1) in order to patch!"
! exit 1;
fi
if [ ! -d boost ]; then
! echo "You must have a destination directory (boost) in order to patch!"
! exit 1;
fi
--- 8,18 ----
if [ ! -d boost_1_33_1 ]; then
! echo "You must have a source directory (boost_1_33_1) in order to patch!"
! exit 1;
fi
if [ ! -d boost ]; then
! echo "You must have a destination directory (boost) in order to patch!"
! exit 1;
fi
|
