From 1398db50df5bd3e7be30d235d91b225fb3f571da Mon Sep 17 00:00:00 2001
From: Wojtek <wskozlowski@dbzero.io>
Date: Wed, 27 May 2026 15:13:48 +0200
Subject: [PATCH] windows compile fixes

---
 meson.build                                           | 11 +++++------
 src/dbzero/bindings/python/embedded/EmbeddedDict.cpp  |  1 +
 .../bindings/python/embedded/EmbeddedObject.cpp       |  3 +++
 src/dbzero/object_model/object/ContentIndex.hpp       |  1 +
 src/dbzero/object_model/object/InternContent.cpp      |  2 ++
 .../object_model/object/ObjectImmutableImpl.hpp       |  2 ++
 src/dbzero/object_model/object/ObjectImplBase.hpp     |  8 ++++++++
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 7f97d185..e8dcc7fe 100644
--- a/meson.build
+++ b/meson.build
@@ -64,12 +64,11 @@ if build_machine.system() == 'linux' or  build_machine.system() == 'darwin'
     
     add_project_arguments('-std=c++17', language : 'cpp')  
 else 
-    add_project_arguments(
-        '-ldl',
-        '-lm',
-        '-lpthread',
-        language : 'cpp')
-    add_project_arguments('-std:c++20', language : 'cpp')
+    if compiler_id == 'msvc'
+        add_project_arguments('/std:c++20', language : 'cpp')
+    else
+        add_project_arguments('-std=c++20', language : 'cpp')
+    endif
 endif
 
 enable_debug_exceptions = get_option('enable_debug_exceptions')
diff --git a/src/dbzero/bindings/python/embedded/EmbeddedDict.cpp b/src/dbzero/bindings/python/embedded/EmbeddedDict.cpp
index 4176c671..2387ad48 100644
--- a/src/dbzero/bindings/python/embedded/EmbeddedDict.cpp
+++ b/src/dbzero/bindings/python/embedded/EmbeddedDict.cpp
@@ -16,6 +16,7 @@
 #include <climits>
 #include <cmath>
 #include <sstream>
+#include <utility>
 
 namespace db0::python
 {
diff --git a/src/dbzero/bindings/python/embedded/EmbeddedObject.cpp b/src/dbzero/bindings/python/embedded/EmbeddedObject.cpp
index a27ed618..d64b51fe 100644
--- a/src/dbzero/bindings/python/embedded/EmbeddedObject.cpp
+++ b/src/dbzero/bindings/python/embedded/EmbeddedObject.cpp
@@ -26,7 +26,10 @@
 
 #include <sstream>
 #include <cstdint>
+#include <string>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace db0::python
 {
diff --git a/src/dbzero/object_model/object/ContentIndex.hpp b/src/dbzero/object_model/object/ContentIndex.hpp
index 78141404..c4609b15 100644
--- a/src/dbzero/object_model/object/ContentIndex.hpp
+++ b/src/dbzero/object_model/object/ContentIndex.hpp
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <array>
 #include <cstdint>
 #include <memory>
 #include <optional>
diff --git a/src/dbzero/object_model/object/InternContent.cpp b/src/dbzero/object_model/object/InternContent.cpp
index 9d1e7c1d..2d4981c9 100644
--- a/src/dbzero/object_model/object/InternContent.cpp
+++ b/src/dbzero/object_model/object/InternContent.cpp
@@ -5,6 +5,8 @@
 
 #include <cstring>
 #include <memory>
+#include <utility>
+#include <vector>
 
 #include <dbzero/bindings/TypeId.hpp>
 #include <dbzero/bindings/python/PySafeAPI.hpp>
diff --git a/src/dbzero/object_model/object/ObjectImmutableImpl.hpp b/src/dbzero/object_model/object/ObjectImmutableImpl.hpp
index f977a02c..861832c9 100644
--- a/src/dbzero/object_model/object/ObjectImmutableImpl.hpp
+++ b/src/dbzero/object_model/object/ObjectImmutableImpl.hpp
@@ -8,6 +8,8 @@
 
 #include <functional>
 #include <optional>
+#include <string>
+#include <unordered_set>
 
 namespace db0::object_model
 
diff --git a/src/dbzero/object_model/object/ObjectImplBase.hpp b/src/dbzero/object_model/object/ObjectImplBase.hpp
index 94a8df8b..801315c8 100644
--- a/src/dbzero/object_model/object/ObjectImplBase.hpp
+++ b/src/dbzero/object_model/object/ObjectImplBase.hpp
@@ -11,6 +11,14 @@
 #include "o_object.hpp"
 #include "o_immutable_object.hpp"
 
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
 namespace db0
 
 {