diff --git a/MeoAssistance.sln b/MeoAssistance.sln
index aa0bcb746c..5cb3ae4b93 100644
--- a/MeoAssistance.sln
+++ b/MeoAssistance.sln
@@ -10,6 +10,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeoAssistance", "MeoAssista
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmeojson", "meojson\test\vsproj\meojson\libmeojson\libmeojson.vcxproj", "{9CC7838E-D5FB-4771-848D-5F83D638C5AD}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Tools\Test\Test.vcxproj", "{36BC08F3-71CF-429A-AE69-291BE8962CB2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300}
+ {9CC7838E-D5FB-4771-848D-5F83D638C5AD} = {9CC7838E-D5FB-4771-848D-5F83D638C5AD}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -34,6 +40,14 @@ Global
{9CC7838E-D5FB-4771-848D-5F83D638C5AD}.Release|x64.Build.0 = Release|x64
{9CC7838E-D5FB-4771-848D-5F83D638C5AD}.Release|x86.ActiveCfg = Release|Win32
{9CC7838E-D5FB-4771-848D-5F83D638C5AD}.Release|x86.Build.0 = Release|Win32
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Debug|x64.ActiveCfg = Debug|x64
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Debug|x64.Build.0 = Debug|x64
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Debug|x86.ActiveCfg = Debug|Win32
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Debug|x86.Build.0 = Debug|Win32
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Release|x64.ActiveCfg = Release|x64
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Release|x64.Build.0 = Release|x64
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Release|x86.ActiveCfg = Release|Win32
+ {36BC08F3-71CF-429A-AE69-291BE8962CB2}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MeoAssistance/MeoAssistance.vcxproj b/MeoAssistance/MeoAssistance.vcxproj
index 38f7fed5d5..5a68dc3387 100644
--- a/MeoAssistance/MeoAssistance.vcxproj
+++ b/MeoAssistance/MeoAssistance.vcxproj
@@ -18,6 +18,19 @@
x64
+
+
+
+
+
+
+
+
+
+
+
+
+
16.0
Win32Proj
@@ -40,13 +53,13 @@
Unicode
- Application
+ DynamicLibrary
true
v142
Unicode
- Application
+ DynamicLibrary
false
v142
true
@@ -78,13 +91,13 @@
true
- $(SolutionDir)meojson\include;$(OPENCV_PATH)\include\opencv2;$(OPENCV_PATH)\include;$(IncludePath)
- $(SolutionDir)meojson\test\vsproj\meojson\x64\Debug;$(OPENCV_PATH)\x64\vc15\lib;$(LibraryPath)
+ $(ProjectDir)include;$(SolutionDir)meojson\include;$(OPENCV_PATH)\include;$(IncludePath)
+ $(TargetDir);$(OPENCV_PATH)\x64\vc15\lib;$(LibraryPath)
false
- $(SolutionDir)meojson\include;$(OPENCV_PATH)\include\opencv2;$(OPENCV_PATH)\include;$(IncludePath)
- $(SolutionDir)meojson\test\vsproj\meojson\x64\Release;$(OPENCV_PATH)\x64\vc15\lib;$(LibraryPath)
+ $(ProjectDir)include;$(SolutionDir)meojson\include;$(OPENCV_PATH)\include;$(IncludePath)
+ $(TargetDir);$(OPENCV_PATH)\x64\vc15\lib;$(LibraryPath)
@@ -122,12 +135,14 @@
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
stdcpp17
+ stdc11
Console
true
opencv_world452d.lib;libmeojson.lib;%(AdditionalDependencies)
RequireAdministrator
+ $(TargetDir)
@@ -137,7 +152,7 @@
xcopy /e /y /i $(SolutionDir)resource $(TargetDir)resource
- copy config.json
+ copy resource
@@ -149,6 +164,7 @@
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
stdcpp17
+ stdc11
Console
@@ -157,32 +173,19 @@
true
opencv_world452.lib;libmeojson.lib;%(AdditionalDependencies)
RequireAdministrator
+ $(TargetDir)
- xcopy /e /y $(SolutionDir)resource $(TargetDir)
+ xcopy /e /y /i $(SolutionDir)resource $(TargetDir)resource
- copy config.json
+ copy resource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MeoAssistance/AssDef.h b/MeoAssistance/include/AssDef.h
similarity index 100%
rename from MeoAssistance/AssDef.h
rename to MeoAssistance/include/AssDef.h
diff --git a/MeoAssistance/Assistance.h b/MeoAssistance/include/Assistance.h
similarity index 96%
rename from MeoAssistance/Assistance.h
rename to MeoAssistance/include/Assistance.h
index d611b83704..598a0d79ac 100644
--- a/MeoAssistance/Assistance.h
+++ b/MeoAssistance/include/Assistance.h
@@ -12,7 +12,7 @@ namespace MeoAssistance {
class WinMacro;
class Identify;
- class Assistance
+ class __declspec(dllexport) Assistance
{
public:
Assistance();
diff --git a/MeoAssistance/Configer.h b/MeoAssistance/include/Configer.h
similarity index 100%
rename from MeoAssistance/Configer.h
rename to MeoAssistance/include/Configer.h
diff --git a/MeoAssistance/Identify.h b/MeoAssistance/include/Identify.h
similarity index 100%
rename from MeoAssistance/Identify.h
rename to MeoAssistance/include/Identify.h
diff --git a/MeoAssistance/WinMacro.h b/MeoAssistance/include/WinMacro.h
similarity index 100%
rename from MeoAssistance/WinMacro.h
rename to MeoAssistance/include/WinMacro.h
diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
similarity index 100%
rename from MeoAssistance/Assistance.cpp
rename to MeoAssistance/src/Assistance.cpp
diff --git a/MeoAssistance/Configer.cpp b/MeoAssistance/src/Configer.cpp
similarity index 100%
rename from MeoAssistance/Configer.cpp
rename to MeoAssistance/src/Configer.cpp
diff --git a/MeoAssistance/Identify.cpp b/MeoAssistance/src/Identify.cpp
similarity index 100%
rename from MeoAssistance/Identify.cpp
rename to MeoAssistance/src/Identify.cpp
diff --git a/MeoAssistance/WinMacro.cpp b/MeoAssistance/src/WinMacro.cpp
similarity index 100%
rename from MeoAssistance/WinMacro.cpp
rename to MeoAssistance/src/WinMacro.cpp
diff --git a/Tools/Test/Test.vcxproj b/Tools/Test/Test.vcxproj
new file mode 100644
index 0000000000..353e753b98
--- /dev/null
+++ b/Tools/Test/Test.vcxproj
@@ -0,0 +1,159 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+
+
+
+ 16.0
+ Win32Proj
+ {36bc08f3-71cf-429a-ae69-291be8962cb2}
+ Test
+ 10.0
+
+
+
+ Application
+ true
+ v142
+ Unicode
+
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
+
+ Application
+ true
+ v142
+ Unicode
+
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ false
+
+
+ true
+ $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath)
+ $(TargetDir);$(LibraryPath)
+
+
+ false
+ $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath)
+ $(TargetDir);$(LibraryPath)
+
+
+
+ Level3
+ true
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+
+
+ Console
+ true
+
+
+
+
+ Level3
+ true
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ stdcpp17
+ stdc11
+
+
+ Console
+ true
+ MeoAssistance.lib;%(AdditionalDependencies)
+ $(TargetDir);%(AdditionalLibraryDirectories)
+
+
+
+
+ Level3
+ true
+ true
+ true
+ NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ stdcpp17
+ stdc11
+
+
+ Console
+ true
+ true
+ true
+ MeoAssistance.lib;%(AdditionalDependencies)
+ $(TargetDir);%(AdditionalLibraryDirectories)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MeoAssistance/main.cpp b/Tools/Test/main.cpp
similarity index 94%
rename from MeoAssistance/main.cpp
rename to Tools/Test/main.cpp
index 319c37f122..6d38d8f4e6 100644
--- a/MeoAssistance/main.cpp
+++ b/Tools/Test/main.cpp
@@ -1,5 +1,4 @@
#include "Assistance.h"
-#include "Identify.h"
#include
diff --git a/meojson b/meojson
index 0a86b19d2a..5c3b080c91 160000
--- a/meojson
+++ b/meojson
@@ -1 +1 @@
-Subproject commit 0a86b19d2ac2eeb60b3840f95f81c6a15d7c370b
+Subproject commit 5c3b080c9106d42d40f391599afe9268a34e7e4f