Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use cleaner hack for boost.

Also use static build.
  • Loading branch information...
commit 63581f70dc3039da62704a18b9dd79dff87ab5b8 1 parent 4544742
Peter Szücs sajty authored erikogenvik committed

Showing 2 changed files with 7 additions and 13 deletions. Show diff stats Hide diff stats

  1. +1 1  hammer.sh
  2. +6 12 mingw_install_deps.sh
2  hammer.sh
@@ -37,7 +37,7 @@ CMAKE_EXTRA_FLAGS=""
37 37
38 38 if [[ x$MSYSTEM = x"MINGW32" && $1 != "install-deps" ]] ; then
39 39 export CONFIGURE_EXTRA_FLAGS="--enable-shared --disable-static"
40   - export CXXFLAGS="-O3 -msse2 -ffast-math -mthreads $CXXFLAGS"
  40 + export CXXFLAGS="-O3 -msse2 -ffast-math -mthreads -DBOOST_THREAD_USE_LIB $CXXFLAGS"
41 41 export PATH="$PREFIX/bin:$PATH"
42 42 export CPATH="$PREFIX/include:$CPATH"
43 43 export LIBRARY_PATH="$PREFIX/lib:$LIBRARY_PATH"
18 mingw_install_deps.sh
@@ -192,7 +192,7 @@ fi
192 192
193 193 export CFLAGS="-O3 -msse2 -ffast-math -mthreads -DNDEBUG -I$PREFIX/include $CFLAGS_SAVE"
194 194 #without -msse2 ogre is not building
195   -export CXXFLAGS="-O3 -msse2 -ffast-math -mthreads -DNDEBUG -I$PREFIX/include $CXXFLAGS_SAVE"
  195 +export CXXFLAGS="-O3 -msse2 -ffast-math -mthreads -DNDEBUG -DBOOST_THREAD_USE_LIB -I$PREFIX/include $CXXFLAGS_SAVE"
196 196 export LDFLAGS="-L$PREFIX/lib $LDFLAGS_SAVE"
197 197
198 198 #install zziplib
@@ -242,22 +242,16 @@ if [ ! -f $PKGLOCKFILE ]; then
242 242 fi
243 243
244 244 #install boost
245   -#hacks:
246   -# bjam generated in msys is not working, we need prebuilt bjam.
247   -# "./bjam install" is not working in msys, we need to install it manually.
248 245 PKGLOCKFILE="$LOCKDIR/boost_installed.lock"
249 246 if [ ! -f $PKGLOCKFILE ]; then
250   - wget -c -P $DLDIR http://sourceforge.net/projects/boost/files/boost-jam/3.1.18/boost-jam-3.1.18-1-ntx86.zip/download
251   - extract $DLDIR/boost-jam-3.1.18-1-ntx86.zip
252 247 wget -c -P $DLDIR http://sourceforge.net/projects/boost/files/boost/1.46.1/boost_1_46_1.tar.bz2/download
253 248 extract $DLDIR/boost_1_46_1.tar.bz2
254   - ln -s $PWD/boost-jam-3.1.18-1-ntx86/bjam.exe $PWD/boost_1_46_1/bjam
255 249 cd boost_1_46_1
256   - ./bjam --with-thread --with-date_time --stagedir=$PREFIX --layout=system variant=release link=shared toolset=gcc
257   - #"./bjam install" is not working in msys, we need to install the headers manually.
258   - cp -r boost $PREFIX/include
259   - mv $PREFIX/lib/libboost_date_time.dll $PREFIX/bin/libboost_date_time.dll
260   - mv $PREFIX/lib/libboost_thread.dll $PREFIX/bin/libboost_thread.dll
  250 + ./bootstrap.sh --with-toolset=mingw
  251 + #solution found here: http://stackoverflow.com/questions/5012429/building-boost-under-msys-cant-find-mingw-jam
  252 + sed -i "s/mingw/gcc/g" project-config.jam;
  253 + ./bjam --with-thread --with-date_time --prefix=$PREFIX --layout=system variant=release link=static toolset=gcc install
  254 +
261 255 cd ..
262 256 touch $PKGLOCKFILE
263 257 fi

0 comments on commit 63581f7

Please sign in to comment.
Something went wrong with that request. Please try again.