diff --git a/.gitignore b/.gitignore index a4945d8..0b8beb5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /CCEngineLoader/Debug/ /CCEngineLoader/Release/ /CCEngineLoader/GeneratedFiles/ +/CCEngine/GeneratedFiles/ +/CCEngine/CCEngine.aps diff --git a/CCEngine/CCEngine.ico b/CCEngine/CCEngine.ico new file mode 100644 index 0000000..1c4fb80 Binary files /dev/null and b/CCEngine/CCEngine.ico differ diff --git a/CCEngine/CCEngine.qrc b/CCEngine/CCEngine.qrc new file mode 100644 index 0000000..9a333f7 --- /dev/null +++ b/CCEngine/CCEngine.qrc @@ -0,0 +1,5 @@ + + + Resources/iconmonstr-banknote-multi-6-icon-256.png + + diff --git a/CCEngine/CCEngine.rc b/CCEngine/CCEngine.rc new file mode 100644 index 0000000..16296ff --- /dev/null +++ b/CCEngine/CCEngine.rc @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE "CCEngine.ico" + diff --git a/CCEngine/CCEngine.ui b/CCEngine/CCEngine.ui new file mode 100644 index 0000000..200eccd --- /dev/null +++ b/CCEngine/CCEngine.ui @@ -0,0 +1,442 @@ + + + CCEngineClass + + + + 0 + 0 + 400 + 265 + + + + CCEngine + + + + :/Resources/iconmonstr-banknote-multi-6-icon-256.png:/Resources/iconmonstr-banknote-multi-6-icon-256.png + + + + + + 10 + 10 + 381 + 51 + + + + Activation + + + + + 10 + 20 + 51 + 16 + + + + Status: + + + + + + 70 + 20 + 111 + 16 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Active + + + + + + 140 + 20 + 70 + 20 + + + + Detail + + + + + + 220 + 20 + 70 + 20 + + + + Activate + + + false + + + + + + + 10 + 70 + 381 + 81 + + + + HTTP Server + + + + + 10 + 20 + 109 + 23 + + + + Port + + + + + + 70 + 20 + 50 + 20 + + + + + + + 5 + + + + + + 140 + 50 + 101 + 20 + + + + Open browser + + + false + + + false + + + + + + 10 + 50 + 51 + 16 + + + + Status: + + + + + + 70 + 50 + 111 + 16 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Running + + + + + + 140 + 20 + 101 + 20 + + + + Restart + + + false + + + false + + + + + + + 10 + 160 + 381 + 81 + + + + Updates + + + + + 10 + 20 + 51 + 16 + + + + Status: + + + + + + 130 + 20 + 111 + 16 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + Up to date + + + + + + 240 + 20 + 101 + 20 + + + + Check for updates + + + + + + 240 + 50 + 101 + 20 + + + + Update + + + + + + 10 + 50 + 121 + 16 + + + + Updates pending + + + + + + 130 + 50 + 111 + 16 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 0 + 150 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + + 0 + + + + + + + + + + + + diff --git a/CCEngine/CCEngine.vcxproj b/CCEngine/CCEngine.vcxproj index d3bfdfe..fc51825 100644 --- a/CCEngine/CCEngine.vcxproj +++ b/CCEngine/CCEngine.vcxproj @@ -10,24 +10,9 @@ Win32 - - - - - - - - - - - - {51345e59-83e5-4389-93a9-0131b40522b7} - - - 15.0 {51637EB3-9942-43AE-9272-9DD85412EFC7} - Win32Proj + Qt4VSv1.0 CCEngine 10.0.16299.0 @@ -46,17 +31,28 @@ MultiByte - - - + + $(MSBuildProjectDirectory)\QtMsBuild + + + + + + + + + + + + @@ -72,15 +68,17 @@ Level3 Disabled true - _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0601;WIN32;_DEBUG;%(PreprocessorDefinitions) true $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories) stdcpplatest + ProgramDatabase + MultiThreadedDebugDLL + true - Console + Windows true - /verbose:lib %(AdditionalOptions) @@ -89,14 +87,13 @@ Level3 MaxSpeed true - _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);BOOST_EXCEPTION_DISABLE + _WIN32_WINNT=0x0601;WIN32;NDEBUG;%(PreprocessorDefinitions);BOOST_EXCEPTION_DISABLE true $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories) stdcpplatest - Console - true + Windows true false YES @@ -104,8 +101,45 @@ false + + 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) + + + + + + + + + + + + + + + + + + + + + + + {51345e59-83e5-4389-93a9-0131b40522b7} + + + + + + + + + + + \ No newline at end of file diff --git a/CCEngine/Resources/iconmonstr-banknote-multi-6-icon-256.png b/CCEngine/Resources/iconmonstr-banknote-multi-6-icon-256.png new file mode 100644 index 0000000..b9fbb50 Binary files /dev/null and b/CCEngine/Resources/iconmonstr-banknote-multi-6-icon-256.png differ diff --git a/CCEngineLoader/CCEngineLoader.vcxproj b/CCEngineLoader/CCEngineLoader.vcxproj index 2cfee77..384551e 100644 --- a/CCEngineLoader/CCEngineLoader.vcxproj +++ b/CCEngineLoader/CCEngineLoader.vcxproj @@ -55,40 +55,56 @@ - - - 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) - - + + true + + + false + - WIN32;%(PreprocessorDefinitions) - $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories) + NotUsing + Level3 Disabled + true + _WIN32_WINNT=0x0601;WIN32;_DEBUG;%(PreprocessorDefinitions) + true + $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories) + stdcpplatest ProgramDatabase MultiThreadedDebugDLL true Windows - $(OutDir)\$(ProjectName).exe true + + + NotUsing + Level3 + MaxSpeed + true + _WIN32_WINNT=0x0601;WIN32;NDEBUG;%(PreprocessorDefinitions);BOOST_EXCEPTION_DISABLE + true + $(ProjectDir)..\..\libLicenseClient\api;%(AdditionalIncludeDirectories) + stdcpplatest + + + Windows + true + false + YES + false + + false + + + 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) + +