Browse files

Fixed building of boost in Release mode. Added boost to the get_exter…

…nals build script for windows.
  • Loading branch information...
1 parent 83706ba commit 40249497fb6caa88a476423e4b6ca544905ca71e @ajpalkovic ajpalkovic committed Oct 12, 2010
Showing with 18 additions and 6 deletions.
  1. +6 −0 external/build_boost_win.cmd
  2. +1 −0 external/build_externals_win.cmd
  3. +9 −4 external/get_externals_win.sh
  4. +2 −2 src/e-exe/e-exe.vcproj
View
6 external/build_boost_win.cmd
@@ -0,0 +1,6 @@
+@echo off
+
+echo Building boost...
+pushd boost
+
+.\bootstrap && .\bjam link=static runtime-link=static && popd
View
1 external/build_externals_win.cmd
@@ -12,6 +12,7 @@ call :BUILD pcre\pcre.sln
call :BUILD tinyxml\tinyxml.sln
call build_wxwidgets_win.cmd
+call build_boost_win.cmd
echo Builds complete, check build_logs for possible issues.
View
13 external/get_externals_win.sh
@@ -17,12 +17,13 @@ _download()
for url in \
http://curl.haxx.se/download/curl-7.18.2.tar.gz \
- http://libtomcrypt.com/files/crypt-1.11.tar.bz2 \
- http://math.libtomcrypt.com/files/ltm-0.39.tar.bz2 \
+ http://github.com/ajpalkovic/e/raw/master/external/downloads/crypt-1.11.tar.bz2 \
+ http://github.com/ajpalkovic/e/raw/master/external/downloads/ltm-0.39.tar.bz2 \
http://www.equi4.com/pub/mk/metakit-2.4.9.7.tar.gz \
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.gz \
http://downloads.sourceforge.net/project/tinyxml/tinyxml/2.5.3/tinyxml_2_5_3.tar.gz \
- http://downloads.sourceforge.net/project/wxwindows/wxAll/2.8.10/wxWidgets-2.8.10.tar.bz2
+ http://downloads.sourceforge.net/project/wxwindows/wxAll/2.8.10/wxWidgets-2.8.10.tar.bz2 \
+ http://downloads.sourceforge.net/project/boost/boost/1.44.0/boost_1_44_0.tar.gz
do
if [[ ! -e `basename $url` ]]; then
curl -O -L $url
@@ -37,7 +38,7 @@ _backup_existing_patches()
# Removing previous folders
tempdir=`mktemp -d back.XXXXXX` || exit 1
echo "Backing up patched externals..."
- for dir in curl libtomcrypt libtommath metakit prce tinyxml wxwidgets
+ for dir in curl libtomcrypt libtommath metakit prce tinyxml wxwidgets boost
do
if [[ -e $dir ]]; then
mv $dir $tempdir/$dir;
@@ -57,6 +58,7 @@ _extract_and_patch()
tar -xzf $downloads/pcre-*
tar -xzf $downloads/tinyxml_*
tar -xjf $downloads/wxWidgets-*
+ tar -xzf $downloads/boost_*
# Rename directories to generic names
echo "Renaming dirs..."
@@ -68,6 +70,7 @@ _extract_and_patch()
mv metakit-* metakit
mv pcre-* pcre
mv wxWidgets-* wxwidgets
+ mv boost_* boost
# Apply patches
echo "Applying patches..."
@@ -101,6 +104,8 @@ _next_steps()
echo "tinyxml\tinyxml.sln"
echo "wxwidgets\build\msw\wx.dsw"
echo
+ echo "You must also manually compile boost. build_externals_win.cmd will do this for you."
+ echo
echo "For an automated build, run build_externals_win.cmd in a Visual Studio 2008 Command Prompt."
}
View
4 src/e-exe/e-exe.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="e-exe"
ProjectGUID="{22870FD4-6D33-4353-BF9E-D96EC13BCAB2}"
RootNamespace="eexe"
@@ -120,7 +120,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\;..\..\external\wxwidgets\lib\vc_lib\mswud;..\..\external\wxwidgets\include;..\..\external\pcre;..\..\external\libtomcrypt\src\headers;..\..\external\tinyxml;..\..\external\curl\include;..\..\external\metakit\include;..\..\external\boost"
+ AdditionalIncludeDirectories="..\..\ecore;..\;..\..\external\wxwidgets\lib\vc_lib\mswud;..\..\external\wxwidgets\include;..\..\external\pcre;..\..\external\libtomcrypt\src\headers;..\..\external\tinyxml;..\..\external\curl\include;..\..\external\metakit\include;..\..\external\boost"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"

0 comments on commit 4024949

Please sign in to comment.