GAIGResearch
diff --git a/‎.github/workflows/wheels-test.yml
+1-1 b/‎.github/workflows/wheels-test.yml
+1-1
diff --git a/‎CMakeLists.txt
+59-10 b/‎CMakeLists.txt
+59-10
diff --git a/‎cmake/modules/FetchIMGUI-SFML.cmake
+1-1 b/‎cmake/modules/FetchIMGUI-SFML.cmake
+1-1
diff --git a/‎cmake/modules/FetchSFML.cmake
+3-5 b/‎cmake/modules/FetchSFML.cmake
+3-5
diff --git a/‎cmake/settings/Conan.cmake
+2 b/‎cmake/settings/Conan.cmake
+2
diff --git a/‎cmake/targets/GUI.cmake
+42-13 b/‎cmake/targets/GUI.cmake
+42-13
diff --git a/‎cmake/targets/IMGUI.cmake
+14-2 b/‎cmake/targets/IMGUI.cmake
+14-2
diff --git a/‎cmake/targets/Stratega.cmake
+2-1 b/‎cmake/targets/Stratega.cmake
+2-1
diff --git a/‎deps/conanfile_linux.txt
+5-5 b/‎deps/conanfile_linux.txt
+5-5
diff --git a/‎deps/conanfile_mac.txt
+21 b/‎deps/conanfile_mac.txt
+21
diff --git a/‎deps/conanfile_mac_sfml.txt
+58 b/‎deps/conanfile_mac_sfml.txt
+58
@@ -3,7 +3,7 @@ name: Python Wheel Builds (TEST)
 on:
   push:
     branches:
-      - fix_python_wheels
+      - update_bindings
 env:
     CIBW_SKIP: pp39-win_amd64 pp39-macosx_x86_64 pp39-manylinux_x86_64 pp38-win_amd64 pp38-macosx_x86_64 pp38-manylinux_x86_64 cp36-manylinux_x86_64 cp36-win_amd64 cp36-macosx_x86_64 pp37-win_amd64 pp37-macosx_x86_64 pp37-manylinux_x86_64 pp37-win_amd64
     CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_24_x86_64:latest
 
@@ -1,16 +1,20 @@
 cmake_minimum_required(VERSION 3.18)
+project(Stratega LANGUAGES C CXX)
 
-project(Stratega LANGUAGES CXX)
+#Uncomment if building for Apple
+#project(Stratega LANGUAGES C CXX OBJCXX OBJC)
+#enable_language(OBJC)
+#enable_language(OBJCXX)
+
+#Uncomment if building for Apple with M1 arch arm64
+#set (CMAKE_OSX_ARCHITECTURES "arm64")
 
 # project set'tings
 set(CMAKE_CONFIG_FOLDER "cmake")
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
-if (CMAKE_SYSTEM_NAME MATCHES Linux)
-    set(CONANFILE conanfile_linux.txt)
-else ()
-    set(CONANFILE conanfile.txt)
-endif ()
+
+
 set(DEPENDENCY_DIR "deps")
 set(PROJ_CXX_STD_FEATURE cxx_std_14)
 set(PROJ_CXX_STANDARD C++14)
@@ -51,6 +55,35 @@ option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors (If ENABLE_STRATEGA
 
 option(SGA_BUILD_HEADLESS "Compile Stratega in headless mode" OFF)
 
+# If you are building for MacOS with M1,this option should be ON
+option(SGA_BUILD_SFML_FROM_SOURCE "Compile SFML 2.6.x" OFF)
+
+
+# On linux SFML is not (yet) available from conan due to a missing lib dependency in their recipe.
+# We will have to fetch it manually in this case and add it to our project.
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+    set(CONANFILE conanfile_linux.txt)
+    message(STATUS "running on Linux conanfile_linux")
+elseif (CMAKE_SYSTEM_NAME MATCHES Darwin)
+    
+    if (NOT SGA_BUILD_SFML_FROM_SOURCE)
+        set(CONANFILE conanfile_mac_sfml.txt)
+        message(STATUS "running on Mac conanfile_mac_sfml")
+    else()
+        set(CONANFILE conanfile_mac.txt)
+        message(STATUS "running on Mac conanfile_mac")
+    endif()
+else ()
+    
+    if (NOT SGA_BUILD_SFML_FROM_SOURCE)
+        set(CONANFILE conanfile_windows_sfml.txt)
+        message(STATUS "running on Windows conanfile_sfml")
+    else()
+        set(CONANFILE conanfile_windows.txt)
+        message(STATUS "running on Windows conanfile_windows")
+    endif()
+endif ()
+
 #If CMAKE_NO_SYSTEM_FROM_IMPORTED is OFF, pybind11 should be treated as SYSTEM and it should not throw warnings
 #but it does for some reason that we dont know.
 #The temporal solution for this problem is to disable the warnings when we want to build the pyhton bindings
@@ -117,10 +150,23 @@ include(${CMAKE_CONFIG_FOLDER}/settings/StaticAnalyzers.cmake)
 
 # configure conan and fetch all dependencies
 if(NOT SGA_BUILD_HEADLESS)   
-   if (CMAKE_SYSTEM_NAME MATCHES Linux)
     # on linux SFML is not (yet) available from conan due to a missing lib dependency in their recipe.
     # We will have to fetch it manually in this case and add it to our project.
-    include(${CMAKE_CONFIG_FOLDER}/modules/FetchSFML.cmake)
+    if (SGA_BUILD_SFML_FROM_SOURCE OR CMAKE_SYSTEM_NAME MATCHES Linux)
+        include(${CMAKE_CONFIG_FOLDER}/modules/FetchSFML.cmake)
+        message(STATUS "FetchSFML 2.6.x")
+        #if (CMAKE_SYSTEM_NAME MATCHES Linux)
+        ## # on linux SFML is not (yet) available from conan due to a missing lib dependency in their recipe.
+        ## # We will have to fetch it manually in this case and add it to our project.
+        #include(${CMAKE_CONFIG_FOLDER}/modules/FetchSFML.cmake)
+        #message(STATUS "running on Linux FetchSFML")
+        #elseif (CMAKE_SYSTEM_NAME MATCHES Darwin)
+        ## #MacOS
+        # include(${CMAKE_CONFIG_FOLDER}/modules/FetchSFML.cmake)
+        # message(STATUS "running on Mac FetchSFML")
+        #endif ()
+    else()
+        message(STATUS "NO FetchSFML 2.6.x")
     endif ()
     include(${CMAKE_CONFIG_FOLDER}/modules/FetchIMGUI-SFML.cmake)
 else()
@@ -144,8 +190,10 @@ find_package(Threads)
 if(NOT SGA_BUILD_HEADLESS)
    find_package(imgui REQUIRED)
    find_package(OpenGL REQUIRED)
-   if (CMAKE_SYSTEM_NAME MATCHES Linux)
+   if (SGA_BUILD_SFML_FROM_SOURCE OR CMAKE_SYSTEM_NAME MATCHES Linux)
        add_subdirectory(${sfml_SOURCE_DIR} ${sfml_BINARY_DIR} EXCLUDE_FROM_ALL)
+       #find_package(SFML COMPONENTS system window graphics REQUIRED)
+       #find_package(SFML 2.6 COMPONENTS system window graphics REQUIRED)
    else ()
        find_package(SFML COMPONENTS system window graphics REQUIRED)
    endif ()
@@ -156,10 +204,11 @@ find_package(yaml-cpp REQUIRED)
 find_package(recastnavigation REQUIRED)
 
 
+
 # define the targets of the project
 if(NOT SGA_BUILD_HEADLESS)
    include(${CMAKE_CONFIG_FOLDER}/targets/IMGUI.cmake)
-    include(${CMAKE_CONFIG_FOLDER}/targets/GUI.cmake)
+   include(${CMAKE_CONFIG_FOLDER}/targets/GUI.cmake)
 endif()
 
 include(${CMAKE_CONFIG_FOLDER}/targets/Arena.cmake)
 
@@ -1,6 +1,6 @@
 include(FetchContent)
 
-set(IMGUI-SFML_VERSION 2.3)
+set(IMGUI-SFML_VERSION 2.5)
 FetchContent_Declare (
 		imgui-sfml
 		URL "https://github.com/eliasdaler/imgui-sfml/archive/refs/tags/v${IMGUI-SFML_VERSION}.zip"
 
@@ -3,14 +3,12 @@ include(FetchContent)
 set(SFML_VERSION 2.5.1)
 FetchContent_Declare (
 	sfml
-	URL "https://github.com/SFML/SFML/archive/${SFML_VERSION}.zip"
+	#URL "https://github.com/SFML/SFML/archive/${SFML_VERSION}.zip"
+	URL "https://codeload.github.com/SFML/SFML/zip/refs/heads/2.6.x"
 )
 FetchContent_GetProperties(sfml)
 if(NOT sfml_POPULATED)
 	FetchContent_Populate(sfml)
 	set(SFML_BUILD_NETWORK CACHE BOOL FALSE)
 	set(SFML_BUILD_AUDIO CACHE BOOL FALSE)
-	set(SFML_STATIC_LIBRARIES TRUE)
-#	set(imgui-sfml_SOURCE_DIR ${sfml_SOURCE_DIR} PARENT_SCOPE)
-#	set(imgui-sfml_BINARY_DIR ${sfml_BINARY_DIR} PARENT_SCOPE)
-endif()
+endif()
@@ -14,6 +14,8 @@ macro(run_conan)
             https://api.bintray.com/conan/bincrafters/public-conan)
 
     conan_cmake_run(
+            #Uncomment if building for M1 Apple
+            #ARCH armv8
             CONANFILE ${DEPENDENCY_DIR}/${CONANFILE}
             CONAN_COMMAND ${CONAN_PATH}
             ${CONAN_EXTRA_REQUIRES}
 
@@ -5,20 +5,49 @@ set(GUI_SOURCE_FILES
 list(TRANSFORM GUI_SOURCE_FILES PREPEND "${SUBPROJ_GUI_SRC_DIR}/")
 
 add_executable (gui ${GUI_SOURCE_FILES})
-
 target_include_directories(gui PUBLIC ${SUBPROJ_STRATEGA_INCLUDE_DIR})
 
-target_link_libraries(gui
-        PUBLIC
-        Stratega
-        PRIVATE
-        # other platforms use Conan's `sfml`
-        "$<$<NOT:$<PLATFORM_ID:Linux>>:CONAN_PKG::sfml>"
-        # for linux we have to use the targets of `sfml`'s components individually
-        "$<$<PLATFORM_ID:Linux>:sfml-system>"
-        "$<$<PLATFORM_ID:Linux>:sfml-graphics>"
-        "$<$<PLATFORM_ID:Linux>:sfml-window>"
-        )
+
+if(SGA_BUILD_SFML_FROM_SOURCE OR CMAKE_SYSTEM_NAME MATCHES Linux)
+   target_link_libraries(gui
+    PUBLIC
+    Stratega
+    PRIVATE
+    # other platforms use Conan's `sfml`
+    # for mac we have to use the targets of `sfml`'s components individually
+    #"$<$<PLATFORM_ID:Windows>:CONAN_PKG::sfml>"
+
+    sfml-system
+    sfml-graphics
+    sfml-window
+
+    ## for linux we have to use the targets of `sfml`'s components individually
+    #"$<$<PLATFORM_ID:Linux>:sfml-system>"
+    #"$<$<PLATFORM_ID:Linux>:sfml-graphics>"
+    #"$<$<PLATFORM_ID:Linux>:sfml-window>"
+    )
+else()
+    target_link_libraries(gui
+    PUBLIC
+    Stratega
+    PRIVATE
+    # other platforms use Conan's `sfml`
+    # for mac we have to use the targets of `sfml`'s components individually
+    #"$<$<PLATFORM_ID:Windows>:CONAN_PKG::sfml>"
+    #
+    #"$<$<PLATFORM_ID:Darwin>:sfml-system>"
+    #"$<$<PLATFORM_ID:Darwin>:sfml-graphics>"
+    #"$<$<PLATFORM_ID:Darwin>:sfml-window>"
+    #
+    ## for linux we have to use the targets of `sfml`'s components individually
+    #"$<$<PLATFORM_ID:Linux>:sfml-system>"
+    #"$<$<PLATFORM_ID:Linux>:sfml-graphics>"
+    #"$<$<PLATFORM_ID:Linux>:sfml-window>"
+
+    CONAN_PKG::sfml
+    )
+endif()
+
 
 
 
@@ -37,4 +66,4 @@ set_target_properties(gui PROPERTIES
          RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY}
          ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${ARCHIVE_OUTPUT_DIRECTORY}
          EXECUTABLE_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_DIRECTORY}
-        )
+        )
@@ -6,17 +6,29 @@ list(TRANSFORM IMGUI_SOURCE_FILES PREPEND "${imgui-sfml_SOURCE_DIR}/")
 
 add_library(imgui STATIC ${IMGUI_SOURCE_FILES})
 target_include_directories(imgui PUBLIC ${imgui-sfml_SOURCE_DIR})
+
 target_link_libraries(imgui
         PRIVATE
         CONAN_PKG::imgui
         # other platforms use Conan's `sfml`
-        "$<$<NOT:$<PLATFORM_ID:Linux>>:CONAN_PKG::sfml>"
-        "$<$<PLATFORM_ID:Linux>:OpenGL>"
+        "$<$<PLATFORM_ID:Darwin>:CONAN_PKG::opengl>"
+        #OpenGL
+        "$<$<PLATFORM_ID:Linux>:CONAN_PKG::opengl>"
         "$<$<PLATFORM_ID:Windows>:CONAN_PKG::opengl>"
+        #"$<$<PLATFORM_ID:Windows>:CONAN_PKG::sfml>"
+        #CONAN_PKG::sfml
         #"$<$<NOT:$<PLATFORM_ID:Linux>>:CONAN_PKG::opengl>"
         # for linux we have to use the targets of `sfml`'s components individually
         "$<$<PLATFORM_ID:Linux>:sfml-system>"
         "$<$<PLATFORM_ID:Linux>:sfml-graphics>"
         "$<$<PLATFORM_ID:Linux>:sfml-window>"
+        
+        "$<$<PLATFORM_ID:Darwin>:sfml-system>"
+        "$<$<PLATFORM_ID:Darwin>:sfml-graphics>"
+        "$<$<PLATFORM_ID:Darwin>:sfml-window>"
+
+        sfml-system
+        sfml-graphics
+        sfml-window
         #CONAN_PKG::opengl        
         )
@@ -136,7 +136,8 @@ if(NOT SGA_BUILD_HEADLESS)
     target_link_libraries_system(Stratega CONAN_PKG::imgui)
     target_link_libraries_system(Stratega imgui)
 
-    if(UNIX AND NOT APPLE)
+    #if(UNIX AND NOT APPLE)
+    if(SGA_BUILD_SFML_FROM_SOURCE OR CMAKE_SYSTEM_NAME MATCHES Linux)
         target_link_libraries_system(Stratega sfml-system)
         target_link_libraries_system(Stratega sfml-graphics)
         target_link_libraries_system(Stratega sfml-window)        
 
@@ -1,6 +1,7 @@
 [requires]
 zlib/1.2.12
 gtest/1.11.0
+opengl/system
 pybind11/2.6.1
 recastnavigation/cci.20200511
 yaml-cpp/0.7.0
@@ -9,13 +10,12 @@ doxygen/1.9.2
 boost/1.78.0
 
 [options]
-sfml:graphics=True
-sfml:window=True
-sfml:audio=False
-sfml:network=False
 boost:shared=False
 
 [generators]
 cmake
 cmake_find_package
-cmake_paths
+cmake_paths
+
+[imports]
+lib, *.dylib* -> ./bin
@@ -0,0 +1,21 @@
+[requires]
+zlib/1.2.12
+opengl/system
+gtest/1.11.0
+pybind11/2.6.1
+recastnavigation/cci.20200511
+yaml-cpp/0.7.0
+imgui/1.84.2
+doxygen/1.9.2
+boost/1.78.0
+
+[options]
+boost:shared=False
+
+[generators]
+cmake
+cmake_find_package
+cmake_paths
+
+[imports]
+lib, *.dylib* -> ./bin
@@ -0,0 +1,58 @@
+[requires]
+zlib/1.2.12
+opengl/system
+sfml/2.5.1
+gtest/1.11.0
+pybind11/2.6.1
+recastnavigation/cci.20200511
+yaml-cpp/0.7.0
+imgui/1.84.2
+doxygen/1.9.2
+boost/1.78.0
+
+[options]
+boost:shared=False
+sfml:graphics=True
+sfml:window=True
+sfml:audio=False
+sfml:network=False
+boost:shared=False
+boost:without_atomic=True
+boost:without_chrono=True
+boost:without_container=True
+boost:without_context=True
+boost:without_contract=True
+boost:without_coroutine=True
+boost:without_date_time=True
+boost:without_exception=True
+boost:without_fiber=True
+boost:without_filesystem=True
+boost:without_graph=True
+boost:without_graph_parallel=True
+boost:without_iostreams=True
+boost:without_json=True
+boost:without_locale=True
+boost:without_log=True
+boost:without_math=True
+boost:without_mpi=True
+boost:without_nowide=True
+boost:without_program_options=False
+boost:without_python=True
+boost:without_random=False
+boost:without_regex=True
+boost:without_serialization=True
+boost:without_stacktrace=True
+boost:without_system=False
+boost:without_test=True
+boost:without_thread=True
+boost:without_timer=True
+boost:without_type_erasure=True
+boost:without_wave=True
+
+[generators]
+cmake
+cmake_find_package
+cmake_paths
+
+[imports]
+lib, *.dylib* -> ./bin