# HG changeset patch # User Olaf Wintermann # Date 1684834959 -7200 # Node ID 34f4d78647be0005683d1c800baf59d03ce2906e # Parent 7c3ff86ee9d479bd91fd42d30da902eb50e30525 add ui common to vs build system diff -r 7c3ff86ee9d4 -r 34f4d78647be make/vs/testapp/testapp.vcxproj --- a/make/vs/testapp/testapp.vcxproj Tue May 23 11:11:28 2023 +0200 +++ b/make/vs/testapp/testapp.vcxproj Tue May 23 11:42:39 2023 +0200 @@ -147,6 +147,9 @@ {04d5ee2c-6076-4c7c-8b70-b0f6d602ff55} + + {27da0164-3475-43e2-a1a4-a5d07d305749} + diff -r 7c3ff86ee9d4 -r 34f4d78647be make/vs/toolkit.sln --- a/make/vs/toolkit.sln Tue May 23 11:11:28 2023 +0200 +++ b/make/vs/toolkit.sln Tue May 23 11:42:39 2023 +0200 @@ -7,6 +7,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winui", "..\..\ui\winui\winui.vcxproj", "{04D5EE2C-6076-4C7C-8B70-B0F6D602FF55}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ucx", "ucx\ucx.vcxproj", "{27DA0164-3475-43E2-A1A4-A5D07D305749}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -31,6 +33,14 @@ {04D5EE2C-6076-4C7C-8B70-B0F6D602FF55}.Release|x64.Build.0 = Release|x64 {04D5EE2C-6076-4C7C-8B70-B0F6D602FF55}.Release|x86.ActiveCfg = Release|Win32 {04D5EE2C-6076-4C7C-8B70-B0F6D602FF55}.Release|x86.Build.0 = Release|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x64.ActiveCfg = Debug|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x64.Build.0 = Debug|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x86.ActiveCfg = Debug|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Debug|x86.Build.0 = Debug|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x64.ActiveCfg = Release|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x64.Build.0 = Release|x64 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x86.ActiveCfg = Release|Win32 + {27DA0164-3475-43E2-A1A4-A5D07D305749}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 7c3ff86ee9d4 -r 34f4d78647be make/vs/ucx/ucx.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/ucx/ucx.vcxproj Tue May 23 11:42:39 2023 +0200 @@ -0,0 +1,173 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {27da0164-3475-43e2-a1a4-a5d07d305749} + ucx + 10.0 + + + + Application + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + DynamicLibrary + true + v143 + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\build\vs\$(Platform)\$(Configuration)\ + ..\..\..\build\vs\testapp\$(Platform)\$(Configuration)\ + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + false + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdc17 + + + Console + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 7c3ff86ee9d4 -r 34f4d78647be make/vs/ucx/ucx.vcxproj.filters --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/vs/ucx/ucx.vcxproj.filters Tue May 23 11:42:39 2023 +0200 @@ -0,0 +1,117 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + Quelldateien + + + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + Headerdateien + + + \ No newline at end of file diff -r 7c3ff86ee9d4 -r 34f4d78647be ui/winui/toolkit.cpp --- a/ui/winui/toolkit.cpp Tue May 23 11:11:28 2023 +0200 +++ b/ui/winui/toolkit.cpp Tue May 23 11:42:39 2023 +0200 @@ -37,6 +37,8 @@ #include #include +#include + using namespace winrt; using namespace Microsoft::UI::Xaml; diff -r 7c3ff86ee9d4 -r 34f4d78647be ui/winui/winui.vcxproj --- a/ui/winui/winui.vcxproj Tue May 23 11:11:28 2023 +0200 +++ b/ui/winui/winui.vcxproj Tue May 23 11:42:39 2023 +0200 @@ -112,9 +112,12 @@ Level3 true - _DEBUG;_CONSOLE;UI_WINUI;%(PreprocessorDefinitions) + _DEBUG;_CONSOLE;UI_WINUI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - stdc11 + stdc17 + $(SolutionDir)..\..\ucx;%(AdditionalIncludeDirectories) + + Console @@ -138,6 +141,13 @@ + + + + + + + @@ -145,9 +155,21 @@ + + + + + + + + + + {27da0164-3475-43e2-a1a4-a5d07d305749} + + diff -r 7c3ff86ee9d4 -r 34f4d78647be ui/winui/winui.vcxproj.filters --- a/ui/winui/winui.vcxproj.filters Tue May 23 11:11:28 2023 +0200 +++ b/ui/winui/winui.vcxproj.filters Tue May 23 11:42:39 2023 +0200 @@ -13,6 +13,12 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {f54c3ad7-3a41-4d22-8850-ab4d9272e509} + + + {e701397e-2637-4a23-a260-1d3259292fa8} + @@ -21,6 +27,27 @@ Quelldateien + + Quelldateien\common + + + Quelldateien\common + + + Quelldateien\common + + + Quelldateien\common + + + Quelldateien\common + + + Quelldateien\common + + + Quelldateien\common + @@ -32,5 +59,26 @@ Headerdateien + + Headerdateien\common + + + Headerdateien\common + + + Headerdateien\common + + + Headerdateien\common + + + Headerdateien\common + + + Headerdateien\common + + + Headerdateien\common + \ No newline at end of file