From d72ff7334270de91242240d45263783e72546a1e Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 28 Mar 2019 18:37:02 +0800 Subject: ... --- CMakeLists.txt | 2 +- CMakeSettings.json | 17 ++++ CruUI.sln | 31 ------- CruUI.vcxproj | 202 ----------------------------------------- CruUI.vcxproj.filters | 245 -------------------------------------------------- src/CMakeLists.txt | 2 +- 6 files changed, 19 insertions(+), 480 deletions(-) create mode 100644 CMakeSettings.json delete mode 100644 CruUI.sln delete mode 100644 CruUI.vcxproj delete mode 100644 CruUI.vcxproj.filters diff --git a/CMakeLists.txt b/CMakeLists.txt index db155296..df3e99f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.12) # use 3.12 because VS internal cmake is 3.12 project(CruUI) diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 00000000..1d244620 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,17 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ + "msvc_x64_x64" + ], + "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", + "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "" + } + ] +} \ No newline at end of file diff --git a/CruUI.sln b/CruUI.sln deleted file mode 100644 index 876bbf39..00000000 --- a/CruUI.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2036 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI", "CruUI.vcxproj", "{A987AC8E-C365-44F3-8324-CBA95B33AB97}" -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 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Debug|x64.ActiveCfg = Debug|x64 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Debug|x64.Build.0 = Debug|x64 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Debug|x86.ActiveCfg = Debug|Win32 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Debug|x86.Build.0 = Debug|Win32 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x64.ActiveCfg = Release|x64 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x64.Build.0 = Release|x64 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x86.ActiveCfg = Release|Win32 - {A987AC8E-C365-44F3-8324-CBA95B33AB97}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {89B380B3-5C97-4753-AA00-5E73F9023E30} - EndGlobalSection -EndGlobal diff --git a/CruUI.vcxproj b/CruUI.vcxproj deleted file mode 100644 index 24b6957e..00000000 --- a/CruUI.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {A987AC8E-C365-44F3-8324-CBA95B33AB97} - Win32Proj - 10.0.17134.0 - - - - Application - true - v141 - Unicode - - - Application - false - v141 - Unicode - - - Application - true - v141 - Unicode - - - Application - false - v141 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - MultiThreadedDebugDLL - Level3 - ProgramDatabase - Disabled - $(ProjectDir)\src;%(AdditionalIncludeDirectories) - stdcpplatest - CRU_X86;%(PreprocessorDefinitions) - - - MachineX86 - true - Windows - D3D11.lib;D2d1.lib;DWrite.lib;%(AdditionalDependencies) - - - - - MultiThreadedDLL - Level3 - ProgramDatabase - $(ProjectDir)\src;%(AdditionalIncludeDirectories) - stdcpplatest - CRU_X86;%(PreprocessorDefinitions) - - - MachineX86 - true - Windows - true - true - D3D11.lib;D2d1.lib;DWrite.lib;%(AdditionalDependencies) - - - - - $(ProjectDir)\src;%(AdditionalIncludeDirectories) - stdcpplatest - CRU_X64;%(PreprocessorDefinitions) - - - D3D11.lib;D2d1.lib;DWrite.lib;%(AdditionalDependencies) - - - - - stdcpplatest - $(ProjectDir)\src;%(AdditionalIncludeDirectories) - CRU_X64;%(PreprocessorDefinitions) - - - D3D11.lib;D2d1.lib;DWrite.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CruUI.vcxproj.filters b/CruUI.vcxproj.filters deleted file mode 100644 index 68dc97ba..00000000 --- a/CruUI.vcxproj.filters +++ /dev/null @@ -1,245 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - - - - \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 81038370..da488e08 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,7 @@ target_include_directories(cru_ui PUBLIC .) if(WIN32) target_link_libraries(cru_ui PRIVATE D3D11 D2d1 DWrite) -target_compile_definitions(cru_ui PUBLIC UNICODE _UNICODE) +target_compile_definitions(cru_ui PUBLIC UNICODE _UNICODE) # use unicode endif() add_executable(demo main.cpp) -- cgit v1.2.3