diff --git a/CCEngine.sln b/CCEngine.sln
index e41e22c..a96f4fa 100644
--- a/CCEngine.sln
+++ b/CCEngine.sln
@@ -15,40 +15,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CCEngineLoader", "CCEngineL
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
- Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {51637EB3-9942-43AE-9272-9DD85412EFC7}.Debug|x64.ActiveCfg = Debug|x64
- {51637EB3-9942-43AE-9272-9DD85412EFC7}.Debug|x64.Build.0 = Debug|x64
{51637EB3-9942-43AE-9272-9DD85412EFC7}.Debug|x86.ActiveCfg = Debug|Win32
{51637EB3-9942-43AE-9272-9DD85412EFC7}.Debug|x86.Build.0 = Debug|Win32
- {51637EB3-9942-43AE-9272-9DD85412EFC7}.Release|x64.ActiveCfg = Release|x64
- {51637EB3-9942-43AE-9272-9DD85412EFC7}.Release|x64.Build.0 = Release|x64
{51637EB3-9942-43AE-9272-9DD85412EFC7}.Release|x86.ActiveCfg = Release|Win32
{51637EB3-9942-43AE-9272-9DD85412EFC7}.Release|x86.Build.0 = Release|Win32
- {51345E59-83E5-4389-93A9-0131B40522B7}.Debug|x64.ActiveCfg = Debug|x64
- {51345E59-83E5-4389-93A9-0131B40522B7}.Debug|x64.Build.0 = Debug|x64
{51345E59-83E5-4389-93A9-0131B40522B7}.Debug|x86.ActiveCfg = Debug|Win32
{51345E59-83E5-4389-93A9-0131B40522B7}.Debug|x86.Build.0 = Debug|Win32
- {51345E59-83E5-4389-93A9-0131B40522B7}.Release|x64.ActiveCfg = Release|x64
- {51345E59-83E5-4389-93A9-0131B40522B7}.Release|x64.Build.0 = Release|x64
{51345E59-83E5-4389-93A9-0131B40522B7}.Release|x86.ActiveCfg = Release|Win32
{51345E59-83E5-4389-93A9-0131B40522B7}.Release|x86.Build.0 = Release|Win32
- {E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Debug|x64.ActiveCfg = Debug|x64
- {E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Debug|x64.Build.0 = Debug|x64
{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Debug|x86.ActiveCfg = Debug|Win32
{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Debug|x86.Build.0 = Debug|Win32
- {E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Release|x64.ActiveCfg = Release|x64
- {E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Release|x64.Build.0 = Release|x64
{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Release|x86.ActiveCfg = Release|Win32
{E781AE2E-4A02-4D63-9CAC-1AEBACD9CD73}.Release|x86.Build.0 = Release|Win32
- {B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|Win32
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.ActiveCfg = Debug|Win32
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.Build.0 = Debug|Win32
- {B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|Win32
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|Win32
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
diff --git a/CCEngine/CCEngine.vcxproj b/CCEngine/CCEngine.vcxproj
index 978d624..d3bfdfe 100644
--- a/CCEngine/CCEngine.vcxproj
+++ b/CCEngine/CCEngine.vcxproj
@@ -9,14 +9,6 @@
Release
Win32
-
- Debug
- x64
-
-
- Release
- x64
-
@@ -53,19 +45,6 @@
true
MultiByte
-
- Application
- true
- v141
- MultiByte
-
-
- Application
- false
- v141
- true
- MultiByte
-
@@ -73,46 +52,27 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
true
-
- true
-
false
-
- false
-
NotUsing
Level3
Disabled
true
- _WIN32_WINNT=0x0501;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
true
$(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
stdcpplatest
@@ -123,37 +83,16 @@
/verbose:lib %(AdditionalOptions)
-
-
- NotUsing
- Level3
- Disabled
- true
- _WIN32_WINNT=0x0501;_DEBUG;_LIB;%(PreprocessorDefinitions)
- true
- $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
- stdcpplatest
-
-
- Console
- true
-
-
NotUsing
Level3
MaxSpeed
- true
- true
true
- _WIN32_WINNT=0x0501;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);BOOST_EXCEPTION_DISABLE
+ _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);BOOST_EXCEPTION_DISABLE
true
$(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
stdcpplatest
- false
- false
- None
Console
@@ -166,26 +105,6 @@
false
-
-
- NotUsing
- Level3
- MaxSpeed
- true
- true
- true
- _WIN32_WINNT=0x0501;NDEBUG;_LIB;%(PreprocessorDefinitions)
- true
- $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
- stdcpplatest
-
-
- Console
- true
- true
- true
-
-
diff --git a/CCEngine/project-common.props b/CCEngine/project-common.props
new file mode 100644
index 0000000..5dec48b
--- /dev/null
+++ b/CCEngine/project-common.props
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ %(AdditionalOptions)
+
+
+ %(AdditionalLibraryDirectories)
+ %(AdditionalDependencies)
+ %(AdditionalOptions)
+
+
+
+
\ No newline at end of file
diff --git a/CCEngineLoader/CCEngineLoader.vcxproj b/CCEngineLoader/CCEngineLoader.vcxproj
index b74918f..2cfee77 100644
--- a/CCEngineLoader/CCEngineLoader.vcxproj
+++ b/CCEngineLoader/CCEngineLoader.vcxproj
@@ -30,40 +30,6 @@
MultiByte
-
-
- true
- WIN32;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
-
- MultiThreadedDLL
- true
-
-
- Windows
- $(OutDir)\$(ProjectName).exe
- $(QTDIR)\lib;%(AdditionalLibraryDirectories)
- false
- qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
-
-
- %(FullPath)
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- output
- Moc'ing %(Identity)...
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(ProjectDir)..\..\libLicenseClient\api;$(ZLIB_ROOT_DIR)include;$(LIBZIP_ROOT_DIR)include;$(LIBCURL_ROOT_DIR)include;$(CRYPTOPP_ROOT_DIR)include;$(BOOST_ROOT_DIR)\.
- CURL_STATICLIB;_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING;_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;WIN32;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;_MBCS
- $(QTDIR)
-
-
- Uic'ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h
-
-
- Rcc'ing %(Identity)...
- .\GeneratedFiles\qrc_%(Filename).cpp
-
-
$(MSBuildProjectDirectory)\QtMsBuild
@@ -79,25 +45,39 @@
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+ true
+ WIN32;%(PreprocessorDefinitions)
+ $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
+ MultiThreadedDLL
+ true
+
+
+ Windows
+ $(OutDir)\$(ProjectName).exe
+ /verbose:lib %(AdditionalOptions)
+ Default
+
+
+ WIN32;_MBCS;CURL_STATICLIB;_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING;_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;%(Define)
+ $(BOOST_ROOT_DIR);%(IncludePath)
+
+
- WIN32;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
+ WIN32;%(PreprocessorDefinitions)
+ $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -106,24 +86,8 @@
Windows
$(OutDir)\$(ProjectName).exe
- $(QTDIR)\lib;%(AdditionalLibraryDirectories)
true
- qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
-
- .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- Moc'ing %(Identity)...
- .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(ProjectDir)..\..\libLicenseClient\api;$(ZLIB_ROOT_DIR)include;$(LIBZIP_ROOT_DIR)include;$(LIBCURL_ROOT_DIR)include;$(CRYPTOPP_ROOT_DIR)include;$(BOOST_ROOT_DIR)\.
- WIN32;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;CURL_STATICLIB;_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING;_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_MBCS
-
-
- Uic'ing %(Identity)...
- .\GeneratedFiles\ui_%(Filename).h
-
-
- Rcc'ing %(Identity)...
- .\GeneratedFiles\qrc_%(Filename).cpp
-
diff --git a/CCEngineLoader/CCEngineLoader.vcxproj.filters b/CCEngineLoader/CCEngineLoader.vcxproj.filters
index f2d42ac..88d7d0f 100644
--- a/CCEngineLoader/CCEngineLoader.vcxproj.filters
+++ b/CCEngineLoader/CCEngineLoader.vcxproj.filters
@@ -44,6 +44,9 @@
Header Files
+
+ Header Files
+
@@ -58,9 +61,4 @@
-
-
- Header Files
-
-
\ No newline at end of file
diff --git a/CCEngineLoader/project-common.props b/CCEngineLoader/project-common.props
new file mode 100644
index 0000000..f6357c0
--- /dev/null
+++ b/CCEngineLoader/project-common.props
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ %(AdditionalIncludeDirectories)
+ %(AdditionalOptions)
+
+
+ %(AdditionalDependencies)
+ %(AdditionalOptions)
+
+
+
+
\ No newline at end of file
diff --git a/non-debugable.props b/non-debugable.props
new file mode 100644
index 0000000..2e86c09
--- /dev/null
+++ b/non-debugable.props
@@ -0,0 +1,29 @@
+
+
+
+
+
+ false
+
+
+
+ %(AdditionalIncludeDirectories)
+ BOOST_EXCEPTION_DISABLE;%(PreprocessorDefinitions)
+ %(AdditionalOptions)
+ false
+ None
+
+
+ %(AdditionalDependencies)
+ %(AdditionalOptions)
+ true
+ false
+ YES
+ false
+
+ false
+ UseLinkTimeCodeGeneration
+
+
+
+
\ No newline at end of file
diff --git a/qt-ui-common.props b/qt-ui-common.props
new file mode 100644
index 0000000..7f610bc
--- /dev/null
+++ b/qt-ui-common.props
@@ -0,0 +1,35 @@
+
+
+
+
+
+ false
+
+
+
+ QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
+ .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories)
+
+
+ $(QTDIR)\lib;%(AdditionalLibraryDirectories)
+
+
+ %(FullPath)
+ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
+ output
+ Moc'ing %(Identity)...
+ .\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(IncludePath)
+ QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(Define)
+ $(QTDIR)
+
+
+ Uic'ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h
+
+
+ Rcc'ing %(Identity)...
+ .\GeneratedFiles\qrc_%(Filename).cpp
+
+
+
+
\ No newline at end of file
diff --git a/qt-ui-debug.props b/qt-ui-debug.props
new file mode 100644
index 0000000..634e42a
--- /dev/null
+++ b/qt-ui-debug.props
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ false
+
+
+
+ %(PreprocessorDefinitions)
+
+
+ qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
+
+
+
+
\ No newline at end of file
diff --git a/qt-ui-release.props b/qt-ui-release.props
new file mode 100644
index 0000000..5e16682
--- /dev/null
+++ b/qt-ui-release.props
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ false
+
+
+
+ QT_NO_DEBUG;%(PreprocessorDefinitions)
+
+
+ qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
+
+
+ QT_NO_DEBUG;NDEBUG;%(Define)
+
+
+
+
\ No newline at end of file