diff --git a/.github/workflows/build_binaries_cmake.yml b/.github/workflows/build_binaries_cmake.yml index 149d6a083..b124c78ab 100644 --- a/.github/workflows/build_binaries_cmake.yml +++ b/.github/workflows/build_binaries_cmake.yml @@ -27,7 +27,7 @@ jobs: - os: windows-latest c_compiler: cl cpp_compiler: cl - build_physiboss: "OFF" + build_physiboss: "ON" - os: ubuntu-latest c_compiler: gcc cpp_compiler: g++ diff --git a/.github/workflows/tests_cmake.yml b/.github/workflows/tests_cmake.yml index 25f9a3117..a7b80ce78 100644 --- a/.github/workflows/tests_cmake.yml +++ b/.github/workflows/tests_cmake.yml @@ -36,7 +36,7 @@ jobs: {"use_physiboss": false, cwd: "build/sample_projects/episode", name: "PhysiCell Episode", binary: "episode", max_time: 120, config: "config/PhysiCell_settings.xml", validation_output_folder: ""}, ] platform: [ - {"os": "windows-latest", "c_compiler": "cl", "cpp_compiler": "cl", "build_physiboss": "OFF"}, + {"os": "windows-latest", "c_compiler": "cl", "cpp_compiler": "cl", "build_physiboss": "ON"}, {"os": "ubuntu-latest", "c_compiler": "gcc", "cpp_compiler": "g++", "build_physiboss": "ON"}, {"os": "ubuntu-latest", "c_compiler": "clang", "cpp_compiler": "clang++", "build_physiboss": "ON"}, {"os": "macos-latest", "c_compiler": "gcc-15", "cpp_compiler": "g++-15", "build_physiboss": "ON"}, diff --git a/addons/PhysiBoSS/CMakeLists.txt b/addons/PhysiBoSS/CMakeLists.txt index 8ea5b2cce..e7ab48ca1 100644 --- a/addons/PhysiBoSS/CMakeLists.txt +++ b/addons/PhysiBoSS/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MABOSS_VERSION v2.5.6) +set(MABOSS_VERSION v2.6.5.3) function(create_physiboss_target MAX_NODES) set(TARGET_NAME PhysiBoSS_${MAX_NODES}n) @@ -25,7 +25,11 @@ function(create_physiboss_target MAX_NODES) STREQUAL "arm64") set(MABOSS_ARCHIVE libMaBoSS-macos-arm64.tar.gz) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") - set(MABOSS_ARCHIVE libMaBoSS-win64.tar.gz) + if (MSVC) + set(MABOSS_ARCHIVE libMaBoSS-win64-msvc.tar.gz) + else() + set(MABOSS_ARCHIVE libMaBoSS-win64.tar.gz) + endif() else() message(FATAL_ERROR "Unsupported OS: ${CMAKE_SYSTEM_NAME}") endif() diff --git a/addons/PhysiBoSS/setup_libmaboss.py b/addons/PhysiBoSS/setup_libmaboss.py index 888dd2748..8fb348c56 100644 --- a/addons/PhysiBoSS/setup_libmaboss.py +++ b/addons/PhysiBoSS/setup_libmaboss.py @@ -20,7 +20,7 @@ # Assume Windows mb_file = "" url = "" - maboss_version = "v2.5.6" + maboss_version = "v2.6.5.3" if os_type.lower() == 'darwin': if "ARM64" in platform.uname().version: mb_file = "libMaBoSS-macos-arm64.tar.gz" diff --git a/addons/PhysiBoSS/src/maboss_network.h b/addons/PhysiBoSS/src/maboss_network.h index 5aace16d3..869106796 100644 --- a/addons/PhysiBoSS/src/maboss_network.h +++ b/addons/PhysiBoSS/src/maboss_network.h @@ -1,9 +1,7 @@ #ifndef _MaBoSS_Net_h_ #define _MaBoSS_Net_h_ -#include "StochasticSimulationEngine.h" -#include "BooleanNetwork.h" -#include "RunConfig.h" +#include "engines/StochasticSimulationEngine.h" #include "../../../core/PhysiCell_utilities.h" /**