diff --git a/scripts/core_common/modules/boost.py b/scripts/core_common/modules/boost.py index 710423e..a9da5db 100644 --- a/scripts/core_common/modules/boost.py +++ b/scripts/core_common/modules/boost.py @@ -32,23 +32,26 @@ def make(): if (-1 != config.option("platform").find("win_64")) and not base.is_dir("build/win_64/static"): base.cmd("bootstrap.bat") base.create_dir("build/win_64") + base.cmd("b2.exe", ["headers"]) base.cmd("b2.exe", ["--clean"]) - base.cmd("bjam.exe", ["link=static", "--with-filesystem", "--with-system", "--with-date_time", "--with-regex", "--toolset=" + win_toolset, "address-model=64"]) + base.cmd("bjam.exe", ["--prefix=./../build/win_64", "link=static", "--with-filesystem", "--with-system", "--with-date_time", "--with-regex", "--toolset=" + win_toolset, "address-model=64", "install"]) base.create_dir("build/win_64/static") base.copy_files("stage/lib/*", "build/win_64/static/") if (-1 != config.option("platform").find("win_32")) and not base.is_dir("build/win_32/static"): base.cmd("bootstrap.bat") base.create_dir("build/win_32") + base.cmd("b2.exe", ["headers"]) base.cmd("b2.exe", ["--clean"]) - base.cmd("bjam.exe", ["link=static", "--with-filesystem", "--with-system", "--with-date_time", "--with-regex", "--toolset=" + win_toolset]) + base.cmd("bjam.exe", ["--prefix=./../build/win_32", "link=static", "--with-filesystem", "--with-system", "--with-date_time", "--with-regex", "--toolset=" + win_toolset, "install"]) base.create_dir("build/win_32/static") base.copy_files("stage/lib/*", "build/win_32/static/") if (-1 != config.option("platform").find("linux")) and not base.is_dir("build/linux_64/static"): base.cmd("./bootstrap.sh", ["--with-libraries=filesystem,system,date_time,regex"]) base.create_dir("build/linux_64") + base.cmd("./b2", ["headers"]) base.cmd("./b2", ["--clean"]) - base.cmd("./bjam", ["link=static", "cxxflags=-fPIC"]) + base.cmd("./bjam", ["--prefix=./../build/linux_64", "link=static", "cxxflags=-fPIC", "install"]) base.create_dir("build/linux_64/static") base.copy_files("stage/lib/*", "build/linux_64/static/") # TODO: support x86 @@ -56,8 +59,9 @@ def make(): if (-1 != config.option("platform").find("mac")) and not base.is_dir("build/mac_64/static"): base.cmd("./bootstrap.sh", ["--with-libraries=filesystem,system,date_time,regex"]) base.create_dir("build/mac_64") + base.cmd("./b2", ["headers"]) base.cmd("./b2", ["--clean"]) - base.cmd("./bjam", ["link=static"]) + base.cmd("./bjam", ["--prefix=./../build/mac_64", "link=static", "install"]) base.create_dir("build/mac_64/static") base.copy_files("stage/lib/*", "build/mac_64/static/")