瀏覽代碼

vcmi builds with boost 1.36. Add a note for systems where boost is installed in /usr/lib64.

Frank Zago 16 年之前
父節點
當前提交
0d5de20a7a
共有 3 個文件被更改,包括 8 次插入4 次删除
  1. 6 2
      README.linux
  2. 1 1
      configure
  3. 1 1
      configure.ac

+ 6 - 2
README.linux

@@ -13,7 +13,7 @@ And then regenerate the build system with
 
 
 To compile, at least the following packages (and their development counterparts) are needed to build:
 To compile, at least the following packages (and their development counterparts) are needed to build:
     * libstdc++ devel
     * libstdc++ devel
-	* boost c++ libraries v1.37+ (1.35 will not work) (www.boost.org)
+	* boost c++ libraries v1.36+ (1.35 will not work) (www.boost.org)
 	* sdl,
 	* sdl,
 	* sdl mixer
 	* sdl mixer
 	* sdl image
 	* sdl image
@@ -22,7 +22,11 @@ To compile, at least the following packages (and their development counterparts)
 
 
 Then do the usual 
 Then do the usual 
   ./configure
   ./configure
-followed by
+
+Note that on 64 bits linux, if the boost libraries are installed in /usr/lib64, configure will not find them and will fail. Until this is fixed, use:
+  ./configure --with-boost-libdir=/usr/lib64
+
+Then build vcmi:
   make
   make
 
 
 That will generate vcmiclient, vcmiserver as well as 3 .so libraries.
 That will generate vcmiclient, vcmiserver as well as 3 .so libraries.

+ 1 - 1
configure

@@ -15277,7 +15277,7 @@ fi
 
 
 
 
 if test "x$want_boost" = "xyes"; then
 if test "x$want_boost" = "xyes"; then
-	boost_lib_version_req=1.37
+	boost_lib_version_req=1.36
 	boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
 	boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
 	boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
 	boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
 	boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
 	boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`

+ 1 - 1
configure.ac

@@ -26,7 +26,7 @@ if test "x$GXX" = "xyes" -a "x$enable_debug" = "xyes" ; then
 fi
 fi
 
 
 # Check for Boost libraries
 # Check for Boost libraries
-AX_BOOST_BASE([1.37])
+AX_BOOST_BASE([1.36])
 AX_BOOST_SYSTEM
 AX_BOOST_SYSTEM
 AX_BOOST_FILESYSTEM
 AX_BOOST_FILESYSTEM
 AX_BOOST_THREAD
 AX_BOOST_THREAD