diff --git a/ActiveRecord/ActiveRecord.progen b/ActiveRecord/ActiveRecord.progen index 08164c1db..3862b7c1a 100644 --- 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 index d0af33fa4..cc4b70f39 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 PocoActiveRecordA64d PocoActiveRecordmdd PocoActiveRecordmtd @@ -331,7 +331,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -344,13 +344,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\binA64\PocoActiveRecordA64d.dll true true - ..\binA64\PocoActiveRecordA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoActiveRecordd.lib @@ -364,7 +365,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -376,6 +377,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -393,7 +395,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -403,7 +405,7 @@ true true - ..\libA64\PocoActiveRecordmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -420,7 +422,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -432,6 +434,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -441,7 +444,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +454,7 @@ true true - ..\libA64\PocoActiveRecordmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -468,7 +471,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -480,6 +483,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -489,7 +493,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -502,13 +506,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\bin\PocoActiveRecordd.dll true true - ..\bin\PocoActiveRecordd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoActiveRecordd.lib @@ -522,7 +527,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -534,6 +539,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -551,7 +557,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -561,7 +567,7 @@ true true - ..\lib\PocoActiveRecordmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -578,7 +584,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -590,6 +596,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -599,7 +606,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -609,7 +616,7 @@ true true - ..\lib\PocoActiveRecordmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -626,7 +633,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -635,7 +642,7 @@ true true - ..\lib\PocoActiveRecordmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default @@ -648,7 +655,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,13 +668,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\bin64\PocoActiveRecord64d.dll true true - ..\bin64\PocoActiveRecord64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoActiveRecordd.lib @@ -681,7 +689,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +701,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -710,7 +719,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -720,7 +729,7 @@ true true - ..\lib64\PocoActiveRecordmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -737,7 +746,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -749,6 +758,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -758,7 +768,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -768,7 +778,7 @@ true true - ..\lib64\PocoActiveRecordmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -785,7 +795,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -797,6 +807,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters index f036fdfe6..a0d823385 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {9cca8535-cf0a-4522-9de3-ea3b7be7f991} + {c01cecef-6df2-46a3-ab05-46ed396f6038} - {bd01a2c1-30a0-4c11-b18c-70c3151b477b} + {f809bd11-fc6a-401f-82bd-e20950f1d1b0} - {5e2b163d-82cb-47c5-9df3-11bdd30c15c0} + {114f7d6f-450f-4730-afc3-93c52413d20f} diff --git a/ActiveRecord/testsuite/TestSuite.progen b/ActiveRecord/testsuite/TestSuite.progen index b94f31e3b..a13c41243 100644 --- 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 index 12f536372..b23bf7325 100644 --- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj +++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -356,6 +356,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -364,7 +365,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +377,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,6 +389,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -404,7 +406,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -417,6 +419,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -425,7 +428,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -437,7 +440,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -449,6 +452,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -465,7 +469,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,6 +482,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -486,7 +491,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -498,7 +503,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -510,6 +515,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -526,7 +532,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -539,6 +545,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -547,7 +554,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +566,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,6 +578,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -587,7 +595,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -600,6 +608,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -608,7 +617,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -620,7 +629,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -632,6 +641,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -648,7 +658,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,6 +671,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -669,7 +680,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -681,7 +692,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +704,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -709,7 +721,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -722,6 +734,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -730,7 +743,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +755,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,6 +767,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -770,7 +784,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,6 +797,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -791,7 +806,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -803,7 +818,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -815,6 +830,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -831,7 +847,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -844,6 +860,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -852,7 +869,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -864,7 +881,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -876,6 +893,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters index dfc3e31e2..22cc7d8d6 100644 --- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters +++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,16 +2,16 @@ - {3947c588-f807-4200-8275-91de658656ab} + {0a7b641a-4834-4f9f-b017-9a4120774ae0} - {df9bd59e-3743-49b1-900f-090f8eab11e3} + {6defcb8f-d22e-403f-ac23-1bc786b2bc04} - {283726aa-5601-40b5-bd69-30f542c4ed53} + {7d34b586-f30f-4dfa-9b2d-21b929412de4} - {4fb792f6-42f2-4d69-b1ca-e6fd68675b6f} + {869d3957-fe79-4b78-8f7f-a9836d60d780} diff --git a/Data/MySQL/MySQL.progen b/Data/MySQL/MySQL.progen index 683714c5f..278d9fef7 100644 --- 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 index 5dca686e7..5399c652d 100644 --- 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" diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj index 29b7943d6..abb5d2eb7 100644 --- a/Data/MySQL/MySQL_vs170.vcxproj +++ b/Data/MySQL/MySQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 PocoDataMySQLA64d PocoDataMySQLmdd PocoDataMySQLmtd @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -344,13 +344,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\binA64\PocoDataMySQLA64d.dll true true - ..\..\binA64\PocoDataMySQLA64d.pdb + $(OutDir)$(TargetName).pdb ..\..\libA64;%(AdditionalLibraryDirectories) Console ..\..\libA64\PocoDataMySQLd.lib @@ -364,7 +365,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -376,6 +377,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -393,7 +395,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -403,7 +405,7 @@ true true - ..\..\libA64\PocoDataMySQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -420,7 +422,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -432,6 +434,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -441,7 +444,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +454,7 @@ true true - ..\..\libA64\PocoDataMySQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -468,7 +471,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -480,6 +483,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -489,7 +493,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -502,13 +506,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\bin\PocoDataMySQLd.dll true true - ..\..\bin\PocoDataMySQLd.pdb + $(OutDir)$(TargetName).pdb ..\..\lib;%(AdditionalLibraryDirectories) Console ..\..\lib\PocoDataMySQLd.lib @@ -522,7 +527,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -534,6 +539,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -551,7 +557,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -561,7 +567,7 @@ true true - ..\..\lib\PocoDataMySQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -578,7 +584,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -590,6 +596,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -599,7 +606,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -609,7 +616,7 @@ true true - ..\..\lib\PocoDataMySQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -626,7 +633,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -635,7 +642,7 @@ true true - ..\..\lib\PocoDataMySQLmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default @@ -648,7 +655,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,13 +668,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\bin64\PocoDataMySQL64d.dll true true - ..\..\bin64\PocoDataMySQL64d.pdb + $(OutDir)$(TargetName).pdb ..\..\lib64;%(AdditionalLibraryDirectories) Console ..\..\lib64\PocoDataMySQLd.lib @@ -681,7 +689,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;__LCC__;MySQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +701,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -710,7 +719,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -720,7 +729,7 @@ true true - ..\..\lib64\PocoDataMySQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -737,7 +746,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreaded @@ -749,6 +758,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -758,7 +768,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true EnableFastChecks @@ -768,7 +778,7 @@ true true - ..\..\lib64\PocoDataMySQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -785,7 +795,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;..\..\mysql\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include; ..\..\Data\include;..\..\Data\src;..\..\mysql\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;__LCC__;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -797,6 +807,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/MySQL/testsuite/TestSuite.progen b/Data/MySQL/testsuite/TestSuite.progen index a9fedf186..bce2d53ac 100644 --- a/Data/MySQL/testsuite/TestSuite.progen +++ b/Data/MySQL/testsuite/TestSuite.progen @@ -7,5 +7,6 @@ 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 mysql = ${vc.project.pocobase}\\mysql -vc.project.compiler.include = ${mysql}\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include +vc.project.compiler.include = ${mysql}\\include;${vc.project.pocobase}\\Foundation\\include; \ + ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Data/MySQL/testsuite/TestSuite_VS90.vcproj b/Data/MySQL/testsuite/TestSuite_VS90.vcproj index 2fcd438be..84d1c7f37 100644 --- a/Data/MySQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -356,6 +356,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -364,7 +365,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,6 +389,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -404,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -417,6 +419,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -425,7 +428,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -437,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -449,6 +452,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -465,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,6 +482,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -486,7 +491,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -498,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -510,6 +515,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -526,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -539,6 +545,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -547,7 +554,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,6 +578,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -587,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -600,6 +608,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -608,7 +617,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -620,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -632,6 +641,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -648,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,6 +671,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -669,7 +680,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -681,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +704,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -709,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -722,6 +734,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -730,7 +743,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,6 +767,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -770,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,6 +797,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -791,7 +806,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -803,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -815,6 +830,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -831,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -844,6 +860,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -852,7 +869,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -864,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -876,6 +893,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters index 1c224ebde..a235d3676 100644 --- a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {449315c7-5108-4fb4-b8a0-0442787a8945} + {7a2de31a-3851-4088-9c14-706e03473109} - {2fa4dffd-6dba-4189-b9f5-3c4a041e6809} + {af663958-170c-4adf-a2fc-e3dde9fedc84} - {cb8a4a23-72b2-4622-ac88-ded8df44a54a} + {359523e9-e866-44ed-874f-6c9bcf60e2a4} - {da3d59c5-7f8e-4ffe-942d-cecdeee6ec58} + {69d7242c-ec6a-46cf-b40f-54e3c8981e6c} - {7d488ccf-a2e1-42d4-b6bd-fc91269fb5df} + {669b37d9-6a2e-4919-af2e-4255d5a2b76b} - {90fc90a8-745f-4296-a8e9-7a09caef75f8} + {aa49fa04-b549-4203-9916-6cb958d4d3b2} - {848aa036-edb1-4b2e-bd60-8db096b13241} + {0b628b67-c9e4-471f-944f-37cd6a0726e2} - {ff2f59ec-d56d-45a5-890a-0a0a6cd26044} + {3f6f87ea-5a64-4efc-901b-ceb8cebf4468} diff --git a/Data/ODBC/ODBC.progen b/Data/ODBC/ODBC.progen index c4f142f67..05f759a12 100644 --- a/Data/ODBC/ODBC.progen +++ b/Data/ODBC/ODBC.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 = THREADSAFE vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/ODBC/ODBC_VS90.vcproj b/Data/ODBC/ODBC_VS90.vcproj index dc090854e..656632804 100644 --- a/Data/ODBC/ODBC_VS90.vcproj +++ b/Data/ODBC/ODBC_VS90.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -134,7 +134,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -221,7 +221,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" MinimalRebuild="true" @@ -298,7 +298,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" RuntimeLibrary="0" @@ -368,7 +368,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" MinimalRebuild="true" @@ -445,7 +445,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj index 52b5e120f..267f337ab 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj +++ b/Data/ODBC/ODBC_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 PocoDataODBCA64d PocoDataODBCmdd PocoDataODBCmtd @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -344,6 +344,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -351,7 +352,7 @@ ..\..\binA64\PocoDataODBCA64d.dll true true - ..\..\binA64\PocoDataODBCA64d.pdb + $(OutDir)$(TargetName).pdb ..\..\libA64;%(AdditionalLibraryDirectories) Console ..\..\libA64\PocoDataODBCd.lib @@ -365,7 +366,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -377,6 +378,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -395,7 +397,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -405,7 +407,7 @@ true true - ..\..\libA64\PocoDataODBCmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -422,7 +424,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -434,6 +436,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -443,7 +446,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -453,7 +456,7 @@ true true - ..\..\libA64\PocoDataODBCmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -470,7 +473,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -482,6 +485,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -491,7 +495,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -504,6 +508,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -511,7 +516,7 @@ ..\..\bin\PocoDataODBCd.dll true true - ..\..\bin\PocoDataODBCd.pdb + $(OutDir)$(TargetName).pdb ..\..\lib;%(AdditionalLibraryDirectories) Console ..\..\lib\PocoDataODBCd.lib @@ -525,7 +530,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -537,6 +542,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -555,7 +561,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -565,7 +571,7 @@ true true - ..\..\lib\PocoDataODBCmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -582,7 +588,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -594,6 +600,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -603,7 +610,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -613,7 +620,7 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -630,7 +637,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -639,7 +646,7 @@ true true - ..\..\lib\PocoDataODBCmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default @@ -653,7 +660,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -666,6 +673,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -673,7 +681,7 @@ ..\..\bin64\PocoDataODBC64d.dll true true - ..\..\bin64\PocoDataODBC64d.pdb + $(OutDir)$(TargetName).pdb ..\..\lib64;%(AdditionalLibraryDirectories) Console ..\..\lib64\PocoDataODBCd.lib @@ -687,7 +695,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -699,6 +707,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -717,7 +726,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -727,7 +736,7 @@ true true - ..\..\lib64\PocoDataODBCmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -744,7 +753,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -756,6 +765,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -765,7 +775,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -775,7 +785,7 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -792,7 +802,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -804,6 +814,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/ODBC/ODBC_vs170.vcxproj.filters b/Data/ODBC/ODBC_vs170.vcxproj.filters index 6ea3e1d0f..7cce9d8c3 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj.filters +++ b/Data/ODBC/ODBC_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {b8ec0707-a887-473f-b9df-d375a3cecfc6} + {ab1bd12b-967a-48d9-a972-7079d524ac44} - {5e75780b-745d-43a9-b8d4-2df43dff6bf0} + {71ad1ef0-6dc6-45e8-8c12-1c0503e8c2e9} - {fd620827-243b-4487-8eaa-0a5fa27be6ee} + {ac1c05f5-d9ad-44cf-a750-47d34820b806} diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index e2e80ee00..49a01b0d3 100644 --- a/Data/ODBC/testsuite/TestSuite.progen +++ b/Data/ODBC/testsuite/TestSuite.progen @@ -6,5 +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 +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib diff --git a/Data/ODBC/testsuite/TestSuite_VS90.vcproj b/Data/ODBC/testsuite/TestSuite_VS90.vcproj index e8678b973..40f218e0f 100644 --- a/Data/ODBC/testsuite/TestSuite_VS90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -356,6 +356,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -364,7 +365,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,6 +389,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -404,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -417,6 +419,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -425,7 +428,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -437,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -449,6 +452,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -465,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,6 +482,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -486,7 +491,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -498,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -510,6 +515,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -526,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -539,6 +545,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -547,7 +554,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,6 +578,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -587,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -600,6 +608,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -608,7 +617,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -620,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -632,6 +641,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -648,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,6 +671,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -669,7 +680,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -681,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +704,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -709,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -722,6 +734,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -730,7 +743,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,6 +767,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -770,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,6 +797,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -791,7 +806,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -803,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -815,6 +830,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -831,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -844,6 +860,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -852,7 +869,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -864,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -876,6 +893,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters index 3bd195b93..0ebbcd2bf 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {cc2d8726-73aa-4a01-a748-9d5240c35137} + {8a8e9e4b-3f14-45d4-98df-f1f683ba97a4} - {679e2ecd-01b8-4875-96cc-35ee6773be2a} + {1061d731-1756-40b8-86ba-d5d65d110c74} - {ad30d348-df1b-462c-9d88-94be1caed184} + {4af6ca97-6cdf-48e7-9427-e92587d2e93a} - {7d56d4fd-4d2a-402b-b43b-237218f25a61} + {c97fa050-eabd-4021-bade-78be7a463783} - {9d4c68cd-e9c7-43fa-929e-fd784f31edf5} + {8f9726af-5a39-413e-a3e1-2fffec81087e} - {039d0dc7-42cd-4aec-8039-db32d6d02327} + {b9e2167b-6c0b-46ba-8790-09d312b6283b} - {7b6c55d5-94ba-4c63-bc86-68714e168729} + {73bfa817-5440-4fe0-82b0-d8d3d1f2b421} - {1ec29134-77b5-4419-846e-92210003beb2} + {4bcc2a95-a0be-4b9f-b55b-4b970e339390} diff --git a/Data/PostgreSQL/PostgreSQL.progen b/Data/PostgreSQL/PostgreSQL.progen index 69c140f74..02eec0eaa 100644 --- a/Data/PostgreSQL/PostgreSQL.progen +++ b/Data/PostgreSQL/PostgreSQL.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}\\postgresql\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include +vc.project.compiler.include = ${vc.project.pocobase}\\postgresql\\include; \ + ${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/PostgreSQL/PostgreSQL_VS90.vcproj b/Data/PostgreSQL/PostgreSQL_VS90.vcproj index 80534fd1b..59e2aca3f 100644 --- a/Data/PostgreSQL/PostgreSQL_VS90.vcproj +++ b/Data/PostgreSQL/PostgreSQL_VS90.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -136,7 +136,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -224,7 +224,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -302,7 +302,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -373,7 +373,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" MinimalRebuild="true" @@ -451,7 +451,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj index 20c711b26..34a4ecdf0 100644 --- a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 PocoDataPostgreSQLA64d PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -331,7 +331,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -344,13 +344,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\binA64\PocoDataPostgreSQLA64d.dll true true - ..\..\binA64\PocoDataPostgreSQLA64d.pdb + $(OutDir)$(TargetName).pdb ..\..\libA64;%(AdditionalLibraryDirectories) Console ..\..\libA64\PocoDataPostgreSQLd.lib @@ -364,7 +365,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -376,6 +377,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -393,7 +395,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -403,7 +405,7 @@ true true - ..\..\libA64\PocoDataPostgreSQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -420,7 +422,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -432,6 +434,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -441,7 +444,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +454,7 @@ true true - ..\..\libA64\PocoDataPostgreSQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -468,7 +471,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -480,6 +483,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -489,7 +493,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -502,13 +506,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\bin\PocoDataPostgreSQLd.dll true true - ..\..\bin\PocoDataPostgreSQLd.pdb + $(OutDir)$(TargetName).pdb ..\..\lib;%(AdditionalLibraryDirectories) Console ..\..\lib\PocoDataPostgreSQLd.lib @@ -522,7 +527,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -534,6 +539,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -551,7 +557,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -561,7 +567,7 @@ true true - ..\..\lib\PocoDataPostgreSQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -578,7 +584,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -590,6 +596,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -599,7 +606,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -609,7 +616,7 @@ true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -626,7 +633,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -635,7 +642,7 @@ true true - ..\..\lib\PocoDataPostgreSQLmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default @@ -648,7 +655,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,13 +668,14 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true ..\..\bin64\PocoDataPostgreSQL64d.dll true true - ..\..\bin64\PocoDataPostgreSQL64d.pdb + $(OutDir)$(TargetName).pdb ..\..\lib64;%(AdditionalLibraryDirectories) Console ..\..\lib64\PocoDataPostgreSQLd.lib @@ -681,7 +689,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PostgreSQL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +701,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -710,7 +719,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -720,7 +729,7 @@ true true - ..\..\lib64\PocoDataPostgreSQLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -737,7 +746,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -749,6 +758,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -758,7 +768,7 @@ Disabled - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -768,7 +778,7 @@ true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -785,7 +795,7 @@ true Speed true - .\include;..\..\postgresql\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\postgresql\include; ..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -797,6 +807,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/PostgreSQL/testsuite/TestSuite.progen b/Data/PostgreSQL/testsuite/TestSuite.progen index 22d6acf18..3e02e5225 100644 --- a/Data/PostgreSQL/testsuite/TestSuite.progen +++ b/Data/PostgreSQL/testsuite/TestSuite.progen @@ -7,7 +7,8 @@ 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 postgresql = ${vc.project.pocobase}\\postgresql -vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include +vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include; \ + ${vc.project.pocobase}\\Data\\include;${vc.project.pocobase}\\Data\\src vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS vc.project.linker.dependencies = iphlpapi.lib vc.project.linker.dependencies.debug_shared = diff --git a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj index 9166aa6f2..205430f49 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -356,6 +356,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -364,7 +365,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,6 +389,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -404,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -417,6 +419,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -425,7 +428,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -437,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -449,6 +452,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -465,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,6 +482,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -486,7 +491,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -498,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -510,6 +515,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -526,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -539,6 +545,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -547,7 +554,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,6 +578,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -587,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -600,6 +608,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -608,7 +617,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -620,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -632,6 +641,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -648,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,6 +671,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -669,7 +680,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -681,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +704,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -709,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -722,6 +734,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -730,7 +743,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,6 +767,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -770,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,6 +797,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -791,7 +806,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -803,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -815,6 +830,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -831,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -844,6 +860,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -852,7 +869,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -864,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -876,6 +893,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters index 654cc7f50..0340be8f0 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {e04bdf35-1d0e-4e88-8aa7-91d0096a746d} + {40bc8f7a-43ff-4852-ace5-60ec9cddbb3a} - {cdb6bb71-611d-4ef6-afe7-0942b18f5f7b} + {748dd641-bc6f-4b96-975a-e9cb2abea6ce} - {457de2bf-00a9-46d0-b829-9c0a3fbd4047} + {5ae15642-48c5-4e25-a82e-37c0a6e23b78} - {087aa94e-c4a7-4cc1-afae-7b99f78faceb} + {1ba54474-f1cf-4aa9-8dae-c7e8cfac25fd} - {74d67af4-958c-43a4-893b-7b2b6352d3d3} + {49e48454-e8dd-4e09-88a9-aad31021d102} - {eb4721c3-d8fe-4e94-8f99-eac8123468a2} + {92138048-f8fc-45b2-ae37-1a4f2ad8458e} - {babb012a-e163-42d5-9a70-da09e565fd6e} + {bad834c6-562c-490d-9d9f-f9a237980777} - {0b607550-392b-4d42-a321-ac16d70b6e13} + {94ffbbfa-e25a-4ca2-a364-eb3c45caf208} diff --git a/Data/SQLite/SQLite.progen b/Data/SQLite/SQLite.progen index 48d7f5f4d..aae7329fa 100644 --- a/Data/SQLite/SQLite.progen +++ b/Data/SQLite/SQLite.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 = SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Data/SQLite/SQLite_VS90.vcproj b/Data/SQLite/SQLite_VS90.vcproj index d2fad7511..10d03ec23 100644 --- a/Data/SQLite/SQLite_VS90.vcproj +++ b/Data/SQLite/SQLite_VS90.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS" StringPooling="true" MinimalRebuild="true" @@ -134,7 +134,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS" StringPooling="true" RuntimeLibrary="2" @@ -221,7 +221,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" MinimalRebuild="true" @@ -298,7 +298,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" RuntimeLibrary="0" @@ -368,7 +368,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" MinimalRebuild="true" @@ -445,7 +445,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include" + AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED" StringPooling="true" RuntimeLibrary="2" diff --git a/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj index d1a5bed10..de35c5c6a 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj +++ b/Data/SQLite/SQLite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 PocoDataSQLiteA64d PocoDataSQLitemdd PocoDataSQLitemtd @@ -331,7 +331,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -344,6 +344,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -351,7 +352,7 @@ ..\..\binA64\PocoDataSQLiteA64d.dll true true - ..\..\binA64\PocoDataSQLiteA64d.pdb + $(OutDir)$(TargetName).pdb ..\..\libA64;%(AdditionalLibraryDirectories) Console ..\..\libA64\PocoDataSQLited.lib @@ -365,7 +366,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -377,6 +378,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -395,7 +397,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -405,7 +407,7 @@ true true - ..\..\libA64\PocoDataSQLitemtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -423,7 +425,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -435,6 +437,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -445,7 +448,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -455,7 +458,7 @@ true true - ..\..\libA64\PocoDataSQLitemdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -473,7 +476,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -485,6 +488,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -495,7 +499,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -508,6 +512,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -515,7 +520,7 @@ ..\..\bin\PocoDataSQLited.dll true true - ..\..\bin\PocoDataSQLited.pdb + $(OutDir)$(TargetName).pdb ..\..\lib;%(AdditionalLibraryDirectories) Console ..\..\lib\PocoDataSQLited.lib @@ -529,7 +534,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -541,6 +546,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -559,7 +565,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -569,7 +575,7 @@ true true - ..\..\lib\PocoDataSQLitemtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -587,7 +593,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -599,6 +605,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -609,7 +616,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -619,7 +626,7 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -637,7 +644,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -646,7 +653,7 @@ true true - ..\..\lib\PocoDataSQLitemd.pdb + $(OutDir)$(TargetName).pdb Level3 Default @@ -660,7 +667,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -673,6 +680,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -680,7 +688,7 @@ ..\..\bin64\PocoDataSQLite64d.dll true true - ..\..\bin64\PocoDataSQLite64d.pdb + $(OutDir)$(TargetName).pdb ..\..\lib64;%(AdditionalLibraryDirectories) Console ..\..\lib64\PocoDataSQLited.lib @@ -694,7 +702,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -706,6 +714,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -724,7 +733,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -734,7 +743,7 @@ true true - ..\..\lib64\PocoDataSQLitemtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -752,7 +761,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreaded @@ -764,6 +773,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true @@ -774,7 +784,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true EnableFastChecks @@ -784,7 +794,7 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default @@ -802,7 +812,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -814,6 +824,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true diff --git a/Data/SQLite/SQLite_vs170.vcxproj.filters b/Data/SQLite/SQLite_vs170.vcxproj.filters index d4c55391b..f7614bfd6 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj.filters +++ b/Data/SQLite/SQLite_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {3707e952-0552-4a59-b8b5-4625c2165653} + {0f97d9c5-511d-4ad7-a417-277f1f38d433} - {b5e2c1d5-3bd7-47e1-8dd5-6cf26bfda6cd} + {28c6bf27-daea-4c82-a93e-8bfc510ed367} - {3589dfbc-d508-4ad0-92e6-47b65ad88233} + {98acac2a-fc74-41d6-9658-2beb5cccb3fc} - {b54e14c4-1d53-41dc-a5aa-489cf90ec0ed} + {e689daa1-4175-496f-a5ca-487b96adaa2e} - {7e70a235-1f11-4ac8-b77b-c7baa2cd12ad} + {f0771742-8255-465f-b48b-46534ddb0822} - {8aaf6a2f-54d5-4147-aef1-558b5ceca326} + {fbf0afec-95ea-4501-bb4b-2327a2e74670} diff --git a/Data/SQLite/testsuite/TestSuite.progen b/Data/SQLite/testsuite/TestSuite.progen index a156305a6..c0784b935 100644 --- a/Data/SQLite/testsuite/TestSuite.progen +++ b/Data/SQLite/testsuite/TestSuite.progen @@ -6,5 +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 +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\src vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj index 09ffaea0e..af17fce99 100644 --- a/Data/SQLite/testsuite/TestSuite_VS90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -356,6 +356,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -364,7 +365,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +377,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,6 +389,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -404,7 +406,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -417,6 +419,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -425,7 +428,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -437,7 +440,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -449,6 +452,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -465,7 +469,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,6 +482,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -486,7 +491,7 @@ ..\..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -498,7 +503,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -510,6 +515,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -526,7 +532,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -539,6 +545,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -547,7 +554,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +566,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -571,6 +578,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -587,7 +595,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -600,6 +608,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -608,7 +617,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -620,7 +629,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -632,6 +641,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -648,7 +658,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -661,6 +671,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -669,7 +680,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -681,7 +692,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -693,6 +704,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -709,7 +721,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -722,6 +734,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -730,7 +743,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +755,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -754,6 +767,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -770,7 +784,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -783,6 +797,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -791,7 +806,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -803,7 +818,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -815,6 +830,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true @@ -831,7 +847,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -844,6 +860,7 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true @@ -852,7 +869,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -864,7 +881,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -876,6 +893,7 @@ Level3 Default + $(OutDir)$(TargetName).pdb true diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters index 49eab5e29..5ba14b6fc 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {0f5204ab-bddc-4a41-80ae-bbc7499a76c6} + {3212c920-2f2f-4a45-90d1-a015c9249f4c} - {cbe8d249-19a2-419e-9f5e-1f476e0aa227} + {fbcc075b-24c8-4adb-a855-714a83de0d95} - {8f3961e3-9a30-455c-920d-0760d34a3d8e} + {95071351-fdb1-4abd-9f90-d8ed53a4b121} - {abfc56e0-0f63-4ddb-9b98-ae48e3b9e621} + {e7c8c73d-9ce5-4d39-af7b-5e9137e2d341} - {7353ffba-df44-4737-8d73-381589207fe3} + {6ade71f3-ab22-408a-aa9b-dd9dd505a4a2} - {9f6abdce-8c1d-4d22-9cba-1ebfa28e823c} + {2dbcfeda-f710-451f-83be-a42e16e2ea99} - {b1272400-aa82-487b-8530-0487041d459a} + {c97cc6a2-5f40-4f30-b815-7f723f3a387b} - {54958fce-0543-4d9c-931c-c5fe3a7f3e81} + {dc94f6c5-b6f8-462d-a8e9-6cf80ed5e205} diff --git a/buildwin.ps1 b/buildwin.ps1 index 95c453849..4ee8eb777 100644 --- a/buildwin.ps1 +++ b/buildwin.ps1 @@ -71,7 +71,7 @@ Param function Add-VSCOMNTOOLS([int] $vsver) { - if ($vsver -ge 150) + if ($vsver -ge 150) { $vssetup= $([Environment]::GetFolderPath("MyDocuments")) $vssetup= Join-Path $vssetup "WindowsPowerShell" @@ -94,7 +94,20 @@ function Add-VSCOMNTOOLS([int] $vsver) $range='[17.0,18.0)' } - $installationPath = Get-VSSetupInstance | Select-VSSetupInstance -Version $range -product * -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | Select-Object InstallationPath + $installationPath = "" + if ($platform -eq 'x64') + { + $installationPath = Get-VSSetupInstance | ` + Select-VSSetupInstance -Version $range -product * -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | ` + Select-Object InstallationPath + } + elseif ($platform -eq 'ARM64') + { + $installationPath = Get-VSSetupInstance | ` + Select-VSSetupInstance -Version $range -product * -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.ARM64 | ` + Select-Object InstallationPath + } + $vscomntools = $installationPath.psobject.properties.Value; if ($vsver -eq 150) { @@ -166,6 +179,7 @@ function Set-Environment $Command = '' $CommandArg = '' if ($platform -eq 'x64') { $CommandArg = "amd64" } + if ($platform -eq 'ARM64') { $CommandArg = "ARM64" } else { $CommandArg = "x86" } if ($vs -eq 150) { @@ -244,17 +258,17 @@ function Process-Input if ($omit -ne '') { - Write-Host "Omit: $omit" + Write-Host "Omit: $omit" } if ($openssl_base -ne '') { - Write-Host "OpenSSL: $openssl_base" + Write-Host "OpenSSL: $openssl_base" } if ($mysql_base -ne '') { - Write-Host "MySQL: $mysql_base" + Write-Host "MySQL: $mysql_base" } # NB: this won't work in PowerShell ISE