fix some compile problems

OTSCPP/OTSClassifyEngine/CGroupClassify.cpp

@@ -2,7 +2,7 @@
 #include "LanguageID.h"
 #include "CGroupClassify.h"
 #include <algorithm>
-#include "OTSSTDLibFileMgr.h"
+#include "ExpressionParseEngine/OTSSTDLibFileMgr.h"
 CGroupClassify::CGroupClassify()
 {
 	Init();

OTSCPP/OTSClassifyEngine/CGroupClassify.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "otsdataconst.h"
-//#include "StandardItem.h"
 #include <OTSParticle.h>
 using namespace OTSDATA;
 class __declspec(dllexport) CGroupClassify : public xmls::ISlo

OTSCPP/OTSClassifyEngine/ExpressionClassifyEngine.cpp

@@ -5,7 +5,7 @@
 #include "XMLSerialization.h"
 #include <map>
 #include <Element.h>
-#include "OTSSTDLibFileMgr.h"
+#include "ExpressionParseEngine/OTSSTDLibFileMgr.h"
 #include "COTSUtilityDllFunExport.h"
 
 namespace OTSClassifyEngine

OTSCPP/OTSClassifyEngine/OTSClassifyEngine.vcxproj

@@ -388,7 +388,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford62|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)OTSCPP\OTSClassifyEngine;$(SolutionDir)OTSCPP\OTSClassifyEngine\SpectrumCompareEngine;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\OTSSQLiteDll;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>

OTSCPP/OTSClrInterface/OTSClrInterface.vcxproj

@@ -333,7 +333,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford62|x64'">
     <IncludePath>$(SolutionDir)\OTSCPP\OTSData;$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)\OTSCPP\OTSClassifyEngine\;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include\opencv2;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include\opencv;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include;$(SolutionDir)\OTSCPP\OTSImagePro;$(SolutionDir)\OTSCPP\OTSClrInterface\CommonClr;$(SolutionDir)\OTSCPP\OTSLog;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSClassifyEngine\SpectrumCompareEngine;$(SolutionDir)OTSCPP\OTSRptCalculate\GBCal;$(SolutionDir)OTSCPP\OTSRptCalculate\Model;$(SolutionDir)\OTSCPP\OTSClrInterface\ImageProClr;$(SolutionDir)OTSCPP\OTSRptCalculate\DTL;$(SolutionDir)OTSCPP\OTSSQLiteDll;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>

OTSCPP/OTSControl/OTSControl.vcxproj

@@ -342,7 +342,7 @@
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(IncludePath)</IncludePath>
     <ReferencePath>$(SolutionDir)OTSCPP\OpenDll\OxfordApi61Dll;$(ReferencePath)</ReferencePath>
-    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CleannessRelease|x64'">
     <LinkIncremental>false</LinkIncremental>

OTSCPP/OTSImagePro/OTSImagePro.vcxproj

@@ -392,7 +392,7 @@
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSData;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include\opencv2;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include\opencv;$(SolutionDir)\OTSCPP\OpenCV\$(platform)\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CleannessRelease|x64'">
     <LinkIncremental>false</LinkIncremental>

OTSCPP/OTSRptCalculate/OTSRptCalculate.vcxproj

@@ -425,7 +425,7 @@
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(SolutionDir)OTSCPP\OTSImagePro;$(SolutionDir)OTSCPP\OTSSQLiteDll;$(SolutionDir)OTSCPP\OTSRptCalculate\Tools;$(SolutionDir)OTSCPP\OTSRptCalculate\Model;$(SolutionDir)OTSCPP\OTSRptCalculate\DTL;$(SolutionDir)OTSCPP\OTSRptCalculate\GBCal;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CleannessRelease|x64'">
     <LinkIncremental>false</LinkIncremental>

OTSCPP/OTSSQLiteDll/OTSSQLiteDll.vcxproj

@@ -372,6 +372,7 @@
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll</OutDir>
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IncludePath>$(SolutionDir)OTSCPP\SQLite3Dll;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)\OTSCPP\OTSLog;$(SolutionDir)OTSCPP\Tools;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\OTSCPPDll;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CleannessRelease|x64'">
     <LinkIncremental>false</LinkIncremental>

OTSCommon/OTSCommon.csproj

@@ -131,7 +131,7 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

OTSExtremum/OTSExtremum.csproj

@@ -173,7 +173,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -188,7 +188,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -228,7 +228,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>pdbonly</DebugType>

OTSInclusionsTraceability/OTSInclusionsTraceability.csproj

@@ -124,7 +124,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -187,7 +187,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>

OTSRegister/OTSRegister.csproj

@@ -165,7 +165,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>

OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -196,7 +196,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\OxfordExtender\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

RegistrationAuthorization/RegistrationAuthorization.csproj

@@ -165,7 +165,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford62|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Release_oxford62\</OutputPath>
+    <OutputPath>..\bin\x64\Release_oxford62\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>