fix(build): update buildwin.ps1 script for ARM64; regenerate Data dep…

…endent VS2022 projects
pocoproject · Nov 6, 2023 · 90f64af · 90f64af
1 parent 6317398
commit 90f64af
Show file tree

Hide file tree

Showing 37 changed files with 560 additions and 396 deletions.
diff --git a/ActiveRecord/ActiveRecord.progen b/ActiveRecord/ActiveRecord.progen
@@ -7,7 +7,7 @@ vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
-vc.project.compiler.include = ..\\Foundation\\include, ..\\Data\\include
+vc.project.compiler.include = ..\\Foundation\\include;..\\Data\\include;..\\Data\\src
 vc.project.compiler.defines =
 vc.project.compiler.defines.shared = ${vc.project.name}Lib_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}

diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj b/ActiveRecord/ActiveRecord_vs170.vcxproj
diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters
@@ -2,13 +2,13 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="ActiveRecord">
-      <UniqueIdentifier>{9cca8535-cf0a-4522-9de3-ea3b7be7f991}</UniqueIdentifier>
+      <UniqueIdentifier>{c01cecef-6df2-46a3-ab05-46ed396f6038}</UniqueIdentifier>
     </Filter>
     <Filter Include="ActiveRecord\Header Files">
-      <UniqueIdentifier>{bd01a2c1-30a0-4c11-b18c-70c3151b477b}</UniqueIdentifier>
+      <UniqueIdentifier>{f809bd11-fc6a-401f-82bd-e20950f1d1b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="ActiveRecord\Source Files">
-      <UniqueIdentifier>{5e2b163d-82cb-47c5-9df3-11bdd30c15c0}</UniqueIdentifier>
+      <UniqueIdentifier>{114f7d6f-450f-4730-afc3-93c52413d20f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/ActiveRecord/testsuite/TestSuite.progen b/ActiveRecord/testsuite/TestSuite.progen
@@ -6,4 +6,5 @@ vc.project.pocobase = ..\\..
 vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
-vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include;..\\..\\Data\\SQLite\\include;..\\..\\ActiveRecord\\include;.\\include
+vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Data\\include;..\\..\\Data\\src; \
+	..\\..\\Data\\SQLite\\include;..\\..\\ActiveRecord\\include;.\\include
diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj
diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{3947c588-f807-4200-8275-91de658656ab}</UniqueIdentifier>
+      <UniqueIdentifier>{0a7b641a-4834-4f9f-b017-9a4120774ae0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{df9bd59e-3743-49b1-900f-090f8eab11e3}</UniqueIdentifier>
+      <UniqueIdentifier>{6defcb8f-d22e-403f-ac23-1bc786b2bc04}</UniqueIdentifier>
     </Filter>
     <Filter Include="Generated Header Files">
-      <UniqueIdentifier>{283726aa-5601-40b5-bd69-30f542c4ed53}</UniqueIdentifier>
+      <UniqueIdentifier>{7d34b586-f30f-4dfa-9b2d-21b929412de4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Generated Source Files">
-      <UniqueIdentifier>{4fb792f6-42f2-4d69-b1ca-e6fd68675b6f}</UniqueIdentifier>
+      <UniqueIdentifier>{869d3957-fe79-4b78-8f7f-a9836d60d780}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/Data/MySQL/MySQL.progen b/Data/MySQL/MySQL.progen
@@ -7,7 +7,8 @@ vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = ${vc.project.name}_vs90.vcproj
-vc.project.compiler.include = ${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\mysql\\include
+vc.project.compiler.include = ${vc.project.pocobase}\\Foundation\\include; \
+	${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src;${vc.project.pocobase}\\mysql\\include
 vc.project.compiler.defines = THREADSAFE;__LCC__
 vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
 vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}

diff --git a/Data/MySQL/MySQL_VS90.vcproj b/Data/MySQL/MySQL_VS90.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=""
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -136,7 +136,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -224,7 +224,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=""
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -302,7 +302,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -373,7 +373,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=""
 				Optimization="0"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -451,7 +451,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include"
+				AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;..\..\mysql\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__"
 				StringPooling="true"
 				RuntimeLibrary="2"