diff --git a/.gitignore b/.gitignore
index c262c14..d63528c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ tests/datagen_jose/tickgen
datagen
tests/private
*.dSYM
+launcher.exp
+launcher.lib
testmain.lib
testmain.exp
test.lib
diff --git a/aquery_config.py b/aquery_config.py
index c2ede14..5e4bed2 100644
--- a/aquery_config.py
+++ b/aquery_config.py
@@ -10,7 +10,7 @@ have_hge = False
cygroot = 'c:/msys64/usr/bin'
msbuildroot = ''
os_platform = 'unknown'
-build_driver = 'Makefile'
+build_driver = 'Auto'
def init_config():
global __config_initialized__, os_platform, msbuildroot, build_driver
diff --git a/msc-plugin/libaquery.vcxproj b/msc-plugin/libaquery.vcxproj
index 96b11f8..cb493e4 100644
--- a/msc-plugin/libaquery.vcxproj
+++ b/msc-plugin/libaquery.vcxproj
@@ -97,11 +97,12 @@
stdcpp17
stdc17
Create
- pch.hpp
+ pch_msc.hpp
$(ProjectDir)\..\monetdb\msvc
- ../libaquery.pch
+ $(SolutionDir)..\msc-plugin\pch_msc.pch
true
true
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
Console
@@ -122,7 +123,7 @@
stdcpp17
stdc17
Create
- pch.hpp
+ pch_msc.hpp
None
Full
AnySuitable
@@ -138,7 +139,8 @@
true
false
$(ProjectDir)\..\monetdb\msvc
- ../libaquery.pch
+ $(SolutionDir)..\msc-plugin\pch_msc.pch
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
Console
@@ -160,11 +162,12 @@
stdcpp17
stdc17
Create
- pch.hpp
+ pch_msc.hpp
$(ProjectDir)\..\monetdb\msvc
- ../libaquery.pch
+ $(SolutionDir)..\msc-plugin\pch_msc.pch
true
true
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
Console
@@ -185,7 +188,7 @@
stdcpp17
stdc17
Create
- pch.hpp
+ pch_msc.hpp
None
Full
AnySuitable
@@ -201,7 +204,8 @@
true
false
$(ProjectDir)\..\monetdb\msvc
- ../libaquery.pch
+ $(SolutionDir)..\msc-plugin\pch_msc.pch
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
Console
diff --git a/msc-plugin/msc-plugin.vcxproj b/msc-plugin/msc-plugin.vcxproj
index e0765b4..cec60b3 100644
--- a/msc-plugin/msc-plugin.vcxproj
+++ b/msc-plugin/msc-plugin.vcxproj
@@ -104,11 +104,14 @@
$(ProjectDir)\..\monetdb\msvc
/WL %(AdditionalOptions)
stdc17
- Create
- ./server/pch.hpp
- ../libaquery.pch
+ Use
+ pch_msc.hpp
+
+
true
true
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ pch_msc.hpp
Console
@@ -129,8 +132,8 @@
stdcpp17
$(ProjectDir)\..\monetdb\msvc
stdc17
- Create
- ./server/pch.hpp
+ Use
+ pch_msc.hpp
None
Full
AnySuitable
@@ -145,8 +148,11 @@
false
true
false
- ../libaquery.pch
+
+
false
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ pch_msc.hpp
Console
@@ -175,11 +181,14 @@
$(ProjectDir)\..\monetdb\msvc
/WL %(AdditionalOptions)
stdc17
- Create
- ./server/pch.hpp
- ../libaquery.pch
+ Use
+ pch_msc.hpp
+
+
true
true
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ pch_msc.hpp
Console
@@ -200,8 +209,8 @@
stdcpp17
$(ProjectDir)\..\monetdb\msvc
stdc17
- Create
- ./server/pch.hpp
+ Use
+ pch_msc.hpp
None
Full
AnySuitable
@@ -216,8 +225,11 @@
false
true
false
- ../libaquery.pch
+
+
false
+ $(IntDir)vc$(PlatformToolsetVersion).pdb
+ pch_msc.hpp
Console
diff --git a/msc-plugin/server.sln b/msc-plugin/server.sln
index 8b021f9..84fb37c 100644
--- a/msc-plugin/server.sln
+++ b/msc-plugin/server.sln
@@ -9,9 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj",
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc-plugin", "msc-plugin.vcxproj", "{8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}"
- ProjectSection(ProjectDependencies) = postProject
- {B52AACF7-16A6-4FCA-90AD-867D367BDA4F} = {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}
- EndProjectSection
EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "msvs-py", "..\msvs-py\msvs-py.pyproj", "{CCC243F5-663E-45B7-A6DE-B2468C58B3A7}"
EndProject
diff --git a/reconstruct/storage.py b/reconstruct/storage.py
index 790f073..6d3bb54 100644
--- a/reconstruct/storage.py
+++ b/reconstruct/storage.py
@@ -210,8 +210,8 @@ class Context:
from aquery_config import build_driver, os_platform
if not self.finalized:
headers = ''
- if build_driver == 'MSBuild':
- headers ='#include \"./server/pch.hpp\"\n'
+ # if build_driver == 'MSBuild':
+ # headers ='#include \"./server/pch.hpp\"\n'
for h in self.headers:
if h[0] != '"':
diff --git a/server/monetdb_conn.cpp b/server/monetdb_conn.cpp
index ed9db74..b29f1a8 100644
--- a/server/monetdb_conn.cpp
+++ b/server/monetdb_conn.cpp
@@ -1,4 +1,4 @@
-#include "pch.hpp"
+#include "pch_msc.hpp"
#include "libaquery.h"
#include