diff options
| -rw-r--r-- | CruUI.sln | 22 | ||||
| -rw-r--r-- | CruUI.vcxproj (renamed from CruUI/CruUI.vcxproj) | 154 | ||||
| -rw-r--r-- | CruUI.vcxproj.filters (renamed from CruUI/CruUI.vcxproj.filters) | 156 | ||||
| -rw-r--r-- | CruUI/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | script/build.ps1 | 16 | ||||
| -rw-r--r-- | src/application.cpp (renamed from CruUI/application.cpp) | 0 | ||||
| -rw-r--r-- | src/application.h (renamed from CruUI/application.h) | 0 | ||||
| -rw-r--r-- | src/base.cpp (renamed from CruUI/base.cpp) | 0 | ||||
| -rw-r--r-- | src/base.h (renamed from CruUI/base.h) | 0 | ||||
| -rw-r--r-- | src/cru_event.h (renamed from CruUI/cru_event.h) | 0 | ||||
| -rw-r--r-- | src/debug_base.h (renamed from CruUI/debug_base.h) | 0 | ||||
| -rw-r--r-- | src/exception.cpp (renamed from CruUI/exception.cpp) | 0 | ||||
| -rw-r--r-- | src/exception.h (renamed from CruUI/exception.h) | 0 | ||||
| -rw-r--r-- | src/global_macros.h (renamed from CruUI/global_macros.h) | 0 | ||||
| -rw-r--r-- | src/graph/graph.cpp (renamed from CruUI/graph/graph.cpp) | 0 | ||||
| -rw-r--r-- | src/graph/graph.h (renamed from CruUI/graph/graph.h) | 0 | ||||
| -rw-r--r-- | src/main.cpp (renamed from CruUI/main.cpp) | 0 | ||||
| -rw-r--r-- | src/system_headers.h (renamed from CruUI/system_headers.h) | 0 | ||||
| -rw-r--r-- | src/timer.cpp (renamed from CruUI/timer.cpp) | 0 | ||||
| -rw-r--r-- | src/timer.h (renamed from CruUI/timer.h) | 0 | ||||
| -rw-r--r-- | src/ui/animations/animation.cpp (renamed from CruUI/ui/animations/animation.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/animations/animation.h (renamed from CruUI/ui/animations/animation.h) | 0 | ||||
| -rw-r--r-- | src/ui/control.cpp (renamed from CruUI/ui/control.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/control.h (renamed from CruUI/ui/control.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/button.cpp (renamed from CruUI/ui/controls/button.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/button.h (renamed from CruUI/ui/controls/button.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/linear_layout.cpp (renamed from CruUI/ui/controls/linear_layout.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/linear_layout.h (renamed from CruUI/ui/controls/linear_layout.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/margin_container.cpp (renamed from CruUI/ui/controls/margin_container.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/margin_container.h (renamed from CruUI/ui/controls/margin_container.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/text_block.cpp (renamed from CruUI/ui/controls/text_block.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/text_block.h (renamed from CruUI/ui/controls/text_block.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/text_box.cpp (renamed from CruUI/ui/controls/text_box.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/text_box.h (renamed from CruUI/ui/controls/text_box.h) | 0 | ||||
| -rw-r--r-- | src/ui/controls/toggle_button.cpp (renamed from CruUI/ui/controls/toggle_button.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/controls/toggle_button.h (renamed from CruUI/ui/controls/toggle_button.h) | 0 | ||||
| -rw-r--r-- | src/ui/events/ui_event.cpp (renamed from CruUI/ui/events/ui_event.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/events/ui_event.h (renamed from CruUI/ui/events/ui_event.h) | 0 | ||||
| -rw-r--r-- | src/ui/layout_base.cpp (renamed from CruUI/ui/layout_base.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/layout_base.h (renamed from CruUI/ui/layout_base.h) | 0 | ||||
| -rw-r--r-- | src/ui/ui_base.cpp (renamed from CruUI/ui/ui_base.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/ui_base.h (renamed from CruUI/ui/ui_base.h) | 0 | ||||
| -rw-r--r-- | src/ui/window.cpp (renamed from CruUI/ui/window.cpp) | 0 | ||||
| -rw-r--r-- | src/ui/window.h (renamed from CruUI/ui/window.h) | 0 |
44 files changed, 156 insertions, 224 deletions
@@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +VisualStudioVersion = 15.0.28010.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI", "CruUI\CruUI.vcxproj", "{41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CruUI", "CruUI.vcxproj", "{A987AC8E-C365-44F3-8324-CBA95B33AB97}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,19 +13,19 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Debug|x64.ActiveCfg = Debug|x64 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Debug|x64.Build.0 = Debug|x64 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Debug|x86.ActiveCfg = Debug|Win32 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Debug|x86.Build.0 = Debug|Win32 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Release|x64.ActiveCfg = Release|x64 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Release|x64.Build.0 = Release|x64 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Release|x86.ActiveCfg = Release|Win32 - {41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}.Release|x86.Build.0 = Release|Win32 + {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 = {B0298D8B-D319-488F-99DA-9D5E6851B9F2} + SolutionGuid = {89B380B3-5C97-4753-AA00-5E73F9023E30} EndGlobalSection EndGlobal diff --git a/CruUI/CruUI.vcxproj b/CruUI.vcxproj index 84462410..bb1e1f63 100644 --- a/CruUI/CruUI.vcxproj +++ b/CruUI.vcxproj @@ -20,9 +20,8 @@ </ItemGroup> <PropertyGroup Label="Globals"> <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{41F57B7F-DECE-4021-8EEC-1E8E54E9DFAC}</ProjectGuid> + <ProjectGuid>{A987AC8E-C365-44F3-8324-CBA95B33AB97}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <RootNamespace>CruUI</RootNamespace> <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> @@ -30,14 +29,11 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> @@ -49,7 +45,6 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -73,127 +68,92 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> + <LinkIncremental>true</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PrecompiledHeaderFile /> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> </ClCompile> <Link> - <SubSystem>Windows</SubSystem> + <TargetMachine>MachineX86</TargetMachine> <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> + <TargetMachine>MachineX86</TargetMachine> + <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <AdditionalIncludeDirectories>$(ProjectDir)/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <LanguageStandard>stdcpplatest</LanguageStandard> + </ClCompile> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <LanguageStandard>stdcpplatest</LanguageStandard> </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="application.h" /> - <ClInclude Include="base.h" /> - <ClInclude Include="cru_event.h" /> - <ClInclude Include="debug_base.h" /> - <ClInclude Include="exception.h" /> - <ClInclude Include="graph\graph.h" /> - <ClInclude Include="system_headers.h" /> - <ClInclude Include="timer.h" /> - <ClInclude Include="ui\animations\animation.h" /> - <ClInclude Include="ui\control.h" /> - <ClInclude Include="global_macros.h" /> - <ClInclude Include="ui\controls\button.h" /> - <ClInclude Include="ui\controls\linear_layout.h" /> - <ClInclude Include="ui\controls\margin_container.h" /> - <ClInclude Include="ui\controls\text_block.h" /> - <ClInclude Include="ui\controls\text_box.h" /> - <ClInclude Include="ui\controls\toggle_button.h" /> - <ClInclude Include="ui\events\ui_event.h" /> - <ClInclude Include="ui\layout_base.h" /> - <ClInclude Include="ui\window.h" /> - <ClInclude Include="ui\ui_base.h" /> + <ClCompile Include="src\application.cpp" /> + <ClCompile Include="src\base.cpp" /> + <ClCompile Include="src\exception.cpp" /> + <ClCompile Include="src\graph\graph.cpp" /> + <ClCompile Include="src\main.cpp" /> + <ClCompile Include="src\timer.cpp" /> + <ClCompile Include="src\ui\animations\animation.cpp" /> + <ClCompile Include="src\ui\control.cpp" /> + <ClCompile Include="src\ui\controls\button.cpp" /> + <ClCompile Include="src\ui\controls\linear_layout.cpp" /> + <ClCompile Include="src\ui\controls\margin_container.cpp" /> + <ClCompile Include="src\ui\controls\text_block.cpp" /> + <ClCompile Include="src\ui\controls\text_box.cpp" /> + <ClCompile Include="src\ui\controls\toggle_button.cpp" /> + <ClCompile Include="src\ui\events\ui_event.cpp" /> + <ClCompile Include="src\ui\layout_base.cpp" /> + <ClCompile Include="src\ui\ui_base.cpp" /> + <ClCompile Include="src\ui\window.cpp" /> </ItemGroup> <ItemGroup> - <ClCompile Include="application.cpp" /> - <ClCompile Include="base.cpp" /> - <ClCompile Include="exception.cpp" /> - <ClCompile Include="ui\animations\animation.cpp" /> - <ClCompile Include="ui\controls\button.cpp" /> - <ClCompile Include="ui\controls\margin_container.cpp" /> - <ClCompile Include="ui\controls\text_box.cpp" /> - <ClCompile Include="ui\layout_base.cpp" /> - <ClCompile Include="main.cpp" /> - <ClCompile Include="graph\graph.cpp" /> - <ClCompile Include="timer.cpp" /> - <ClCompile Include="ui\control.cpp" /> - <ClCompile Include="ui\controls\linear_layout.cpp" /> - <ClCompile Include="ui\controls\text_block.cpp" /> - <ClCompile Include="ui\controls\toggle_button.cpp" /> - <ClCompile Include="ui\events\ui_event.cpp" /> - <ClCompile Include="ui\window.cpp" /> - <ClCompile Include="ui\ui_base.cpp" /> + <ClInclude Include="src\application.h" /> + <ClInclude Include="src\base.h" /> + <ClInclude Include="src\cru_event.h" /> + <ClInclude Include="src\debug_base.h" /> + <ClInclude Include="src\exception.h" /> + <ClInclude Include="src\global_macros.h" /> + <ClInclude Include="src\graph\graph.h" /> + <ClInclude Include="src\system_headers.h" /> + <ClInclude Include="src\timer.h" /> + <ClInclude Include="src\ui\animations\animation.h" /> + <ClInclude Include="src\ui\control.h" /> + <ClInclude Include="src\ui\controls\button.h" /> + <ClInclude Include="src\ui\controls\linear_layout.h" /> + <ClInclude Include="src\ui\controls\margin_container.h" /> + <ClInclude Include="src\ui\controls\text_block.h" /> + <ClInclude Include="src\ui\controls\text_box.h" /> + <ClInclude Include="src\ui\controls\toggle_button.h" /> + <ClInclude Include="src\ui\events\ui_event.h" /> + <ClInclude Include="src\ui\layout_base.h" /> + <ClInclude Include="src\ui\ui_base.h" /> + <ClInclude Include="src\ui\window.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/CruUI/CruUI.vcxproj.filters b/CruUI.vcxproj.filters index 3e4538fc..0933ffc9 100644 --- a/CruUI/CruUI.vcxproj.filters +++ b/CruUI.vcxproj.filters @@ -11,128 +11,128 @@ </Filter> <Filter Include="Resource Files"> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> </Filter> </ItemGroup> <ItemGroup> - <ClInclude Include="application.h"> + <ClCompile Include="src\application.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\base.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\exception.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\timer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\graph\graph.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\control.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\layout_base.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\ui_base.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\window.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\animations\animation.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\button.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\linear_layout.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\margin_container.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\text_block.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\text_box.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\controls\toggle_button.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="src\ui\events\ui_event.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="src\application.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="base.h"> + <ClInclude Include="src\base.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\control.h"> + <ClInclude Include="src\cru_event.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\window.h"> + <ClInclude Include="src\debug_base.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="graph\graph.h"> + <ClInclude Include="src\exception.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="exception.h"> + <ClInclude Include="src\global_macros.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="timer.h"> + <ClInclude Include="src\system_headers.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="cru_event.h"> + <ClInclude Include="src\timer.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="system_headers.h"> + <ClInclude Include="src\graph\graph.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\ui_base.h"> + <ClInclude Include="src\ui\control.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\layout_base.h"> + <ClInclude Include="src\ui\layout_base.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\events\ui_event.h"> + <ClInclude Include="src\ui\ui_base.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="global_macros.h"> + <ClInclude Include="src\ui\window.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\text_block.h"> + <ClInclude Include="src\ui\animations\animation.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\linear_layout.h"> + <ClInclude Include="src\ui\controls\button.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="debug_base.h"> + <ClInclude Include="src\ui\controls\linear_layout.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\toggle_button.h"> + <ClInclude Include="src\ui\controls\margin_container.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\animations\animation.h"> + <ClInclude Include="src\ui\controls\text_block.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\button.h"> + <ClInclude Include="src\ui\controls\text_box.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\margin_container.h"> + <ClInclude Include="src\ui\controls\toggle_button.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="ui\controls\text_box.h"> + <ClInclude Include="src\ui\events\ui_event.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <ClCompile Include="application.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\control.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\window.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="graph\graph.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="main.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="exception.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="timer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\ui_base.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\events\ui_event.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\text_block.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\linear_layout.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\toggle_button.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\layout_base.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\animations\animation.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="base.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\button.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\margin_container.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ui\controls\text_box.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> </Project>
\ No newline at end of file diff --git a/CruUI/CMakeLists.txt b/CruUI/CMakeLists.txt deleted file mode 100644 index e7e4fb3f..00000000 --- a/CruUI/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 3.11) -project(CruUI) - -if (MSVC_VERSION GREATER_EQUAL "1900") - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("/std:c++latest" _cpp_latest_flag_supported) - if (_cpp_latest_flag_supported) - add_compile_options("/std:c++latest") - endif() -endif() - -include_directories(.) - -add_executable(CruUI - graph/graph.cpp - ui/animations/animation.cpp - ui/controls/button.cpp - ui/controls/linear_layout.cpp - ui/controls/margin_container.cpp - ui/controls/text_block.cpp - ui/controls/text_box.cpp - ui/controls/toggle_button.cpp - ui/events/ui_event.cpp - ui/control.cpp - ui/layout_base.cpp - ui/ui_base.cpp - ui/window.cpp - application.cpp - base.cpp - exception.cpp - main.cpp - timer.cpp) diff --git a/script/build.ps1 b/script/build.ps1 index 125c305c..0a72d30c 100644 --- a/script/build.ps1 +++ b/script/build.ps1 @@ -1,8 +1,12 @@ +function CheckLastExitCode { + if ($LASTEXITCODE -ne 0) + { + exit $LASTEXITCODE + } +} + vcpkg.exe install folly:x64-windows fmt:x64-windows +& CheckLastExitCode -cd ..\CruUI -Remove-Item build -Recurse -ErrorAction Ignore -New-Item build -ItemType Directory -cd .\build -cmake -G "Visual Studio 15 2017 Win64" .. -cmake --build . +& "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" CruUI.sln /target:Rebuild /p:Platform=x64 /p:Configuration=Debug +& CheckLastExitCode diff --git a/CruUI/application.cpp b/src/application.cpp index af38116f..af38116f 100644 --- a/CruUI/application.cpp +++ b/src/application.cpp diff --git a/CruUI/application.h b/src/application.h index 106e7171..106e7171 100644 --- a/CruUI/application.h +++ b/src/application.h diff --git a/CruUI/base.cpp b/src/base.cpp index f5868170..f5868170 100644 --- a/CruUI/base.cpp +++ b/src/base.cpp diff --git a/CruUI/base.h b/src/base.h index 7ef78014..7ef78014 100644 --- a/CruUI/base.h +++ b/src/base.h diff --git a/CruUI/cru_event.h b/src/cru_event.h index d0a7eb82..d0a7eb82 100644 --- a/CruUI/cru_event.h +++ b/src/cru_event.h diff --git a/CruUI/debug_base.h b/src/debug_base.h index 7669b9df..7669b9df 100644 --- a/CruUI/debug_base.h +++ b/src/debug_base.h diff --git a/CruUI/exception.cpp b/src/exception.cpp index a1d59ceb..a1d59ceb 100644 --- a/CruUI/exception.cpp +++ b/src/exception.cpp diff --git a/CruUI/exception.h b/src/exception.h index 2817f261..2817f261 100644 --- a/CruUI/exception.h +++ b/src/exception.h diff --git a/CruUI/global_macros.h b/src/global_macros.h index 696c5d2b..696c5d2b 100644 --- a/CruUI/global_macros.h +++ b/src/global_macros.h diff --git a/CruUI/graph/graph.cpp b/src/graph/graph.cpp index 30b51413..30b51413 100644 --- a/CruUI/graph/graph.cpp +++ b/src/graph/graph.cpp diff --git a/CruUI/graph/graph.h b/src/graph/graph.h index 0f1d29d1..0f1d29d1 100644 --- a/CruUI/graph/graph.h +++ b/src/graph/graph.h diff --git a/CruUI/main.cpp b/src/main.cpp index 67b35406..67b35406 100644 --- a/CruUI/main.cpp +++ b/src/main.cpp diff --git a/CruUI/system_headers.h b/src/system_headers.h index 99c091e1..99c091e1 100644 --- a/CruUI/system_headers.h +++ b/src/system_headers.h diff --git a/CruUI/timer.cpp b/src/timer.cpp index ce800eee..ce800eee 100644 --- a/CruUI/timer.cpp +++ b/src/timer.cpp diff --git a/CruUI/timer.h b/src/timer.h index 9884e46a..9884e46a 100644 --- a/CruUI/timer.h +++ b/src/timer.h diff --git a/CruUI/ui/animations/animation.cpp b/src/ui/animations/animation.cpp index 9d05860a..9d05860a 100644 --- a/CruUI/ui/animations/animation.cpp +++ b/src/ui/animations/animation.cpp diff --git a/CruUI/ui/animations/animation.h b/src/ui/animations/animation.h index 69b08b0c..69b08b0c 100644 --- a/CruUI/ui/animations/animation.h +++ b/src/ui/animations/animation.h diff --git a/CruUI/ui/control.cpp b/src/ui/control.cpp index 8aec8640..8aec8640 100644 --- a/CruUI/ui/control.cpp +++ b/src/ui/control.cpp diff --git a/CruUI/ui/control.h b/src/ui/control.h index d6cbae40..d6cbae40 100644 --- a/CruUI/ui/control.h +++ b/src/ui/control.h diff --git a/CruUI/ui/controls/button.cpp b/src/ui/controls/button.cpp index b7614f93..b7614f93 100644 --- a/CruUI/ui/controls/button.cpp +++ b/src/ui/controls/button.cpp diff --git a/CruUI/ui/controls/button.h b/src/ui/controls/button.h index bd3f6eb3..bd3f6eb3 100644 --- a/CruUI/ui/controls/button.h +++ b/src/ui/controls/button.h diff --git a/CruUI/ui/controls/linear_layout.cpp b/src/ui/controls/linear_layout.cpp index 8f537ea8..8f537ea8 100644 --- a/CruUI/ui/controls/linear_layout.cpp +++ b/src/ui/controls/linear_layout.cpp diff --git a/CruUI/ui/controls/linear_layout.h b/src/ui/controls/linear_layout.h index 369824d4..369824d4 100644 --- a/CruUI/ui/controls/linear_layout.h +++ b/src/ui/controls/linear_layout.h diff --git a/CruUI/ui/controls/margin_container.cpp b/src/ui/controls/margin_container.cpp index 8f9101b2..8f9101b2 100644 --- a/CruUI/ui/controls/margin_container.cpp +++ b/src/ui/controls/margin_container.cpp diff --git a/CruUI/ui/controls/margin_container.h b/src/ui/controls/margin_container.h index 0eafc40e..0eafc40e 100644 --- a/CruUI/ui/controls/margin_container.h +++ b/src/ui/controls/margin_container.h diff --git a/CruUI/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp index 93d66ba6..93d66ba6 100644 --- a/CruUI/ui/controls/text_block.cpp +++ b/src/ui/controls/text_block.cpp diff --git a/CruUI/ui/controls/text_block.h b/src/ui/controls/text_block.h index c87ffc51..c87ffc51 100644 --- a/CruUI/ui/controls/text_block.h +++ b/src/ui/controls/text_block.h diff --git a/CruUI/ui/controls/text_box.cpp b/src/ui/controls/text_box.cpp index a8d78398..a8d78398 100644 --- a/CruUI/ui/controls/text_box.cpp +++ b/src/ui/controls/text_box.cpp diff --git a/CruUI/ui/controls/text_box.h b/src/ui/controls/text_box.h index b815ed1f..b815ed1f 100644 --- a/CruUI/ui/controls/text_box.h +++ b/src/ui/controls/text_box.h diff --git a/CruUI/ui/controls/toggle_button.cpp b/src/ui/controls/toggle_button.cpp index 68bd0fc9..68bd0fc9 100644 --- a/CruUI/ui/controls/toggle_button.cpp +++ b/src/ui/controls/toggle_button.cpp diff --git a/CruUI/ui/controls/toggle_button.h b/src/ui/controls/toggle_button.h index d496f21a..d496f21a 100644 --- a/CruUI/ui/controls/toggle_button.h +++ b/src/ui/controls/toggle_button.h diff --git a/CruUI/ui/events/ui_event.cpp b/src/ui/events/ui_event.cpp index 59623bab..59623bab 100644 --- a/CruUI/ui/events/ui_event.cpp +++ b/src/ui/events/ui_event.cpp diff --git a/CruUI/ui/events/ui_event.h b/src/ui/events/ui_event.h index b042b706..b042b706 100644 --- a/CruUI/ui/events/ui_event.h +++ b/src/ui/events/ui_event.h diff --git a/CruUI/ui/layout_base.cpp b/src/ui/layout_base.cpp index a26379a0..a26379a0 100644 --- a/CruUI/ui/layout_base.cpp +++ b/src/ui/layout_base.cpp diff --git a/CruUI/ui/layout_base.h b/src/ui/layout_base.h index 163b99b2..163b99b2 100644 --- a/CruUI/ui/layout_base.h +++ b/src/ui/layout_base.h diff --git a/CruUI/ui/ui_base.cpp b/src/ui/ui_base.cpp index 550432e4..550432e4 100644 --- a/CruUI/ui/ui_base.cpp +++ b/src/ui/ui_base.cpp diff --git a/CruUI/ui/ui_base.h b/src/ui/ui_base.h index 43f3c498..43f3c498 100644 --- a/CruUI/ui/ui_base.h +++ b/src/ui/ui_base.h diff --git a/CruUI/ui/window.cpp b/src/ui/window.cpp index 34a54512..34a54512 100644 --- a/CruUI/ui/window.cpp +++ b/src/ui/window.cpp diff --git a/CruUI/ui/window.h b/src/ui/window.h index 40d81a06..40d81a06 100644 --- a/CruUI/ui/window.h +++ b/src/ui/window.h |