From 74f4741f3d7c26db71378b793aa57aaaf233c9b9 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 19:52:09 +0200 Subject: [PATCH 1/7] stuff --- tests/app/src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/app/src/main.cpp b/tests/app/src/main.cpp index 6283f77..2405698 100644 --- a/tests/app/src/main.cpp +++ b/tests/app/src/main.cpp @@ -531,12 +531,12 @@ class application : public ruisapp::application{ auto& cp = c.get().get_widget_as("cube_click_proxy"); auto& bg = c.get().get_widget_as("cube_bg_color"); - cp.press_change_handler = [bg{utki::make_shared_from(bg)}](ruis::click_proxy& w) -> bool { + cp.pressed_change_handler = [bg{utki::make_shared_from(bg)}](ruis::click_proxy& w) -> bool { // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) bg.get().set_color(w.is_pressed() ? 0xff808080 : 0x80808080); return true; }; - cp.press_change_handler(cp); // set initial color + cp.pressed_change_handler(cp); // set initial color cp.click_handler = [cube](ruis::click_proxy&) -> bool { if(cube->is_updating()){ cube->context.get().updater.get().stop(*cube); @@ -602,7 +602,7 @@ class application : public ruisapp::application{ } }; - vertical_list->scroll_change_handler = [vs](ruis::list_widget& l){ + vertical_list->scroll_change_handler = [vs](ruis::list& l){ if(auto s = vs.lock()){ s->set_fraction(l.get_scroll_factor(), false); s->set_band_fraction(l.get_scroll_band()); @@ -655,14 +655,14 @@ class application : public ruisapp::application{ // pan_list { - auto pan_list = c.get().try_get_widget_as("pan_list"); + auto pan_list = c.get().try_get_widget_as("pan_list"); auto hl = utki::make_weak(pan_list); auto horizontal_slider = c.get().try_get_widget_as("horizontal_list_slider"); ASSERT(horizontal_slider) auto hs = utki::make_weak(horizontal_slider); - pan_list->scroll_change_handler = [hs](ruis::list_widget& l){ + pan_list->scroll_change_handler = [hs](ruis::list& l){ if(auto h = hs.lock()){ h->set_fraction(l.get_scroll_factor(), false); h->set_band_fraction(l.get_scroll_band()); From a3bfd9a952bd070f01e8b2131c35c7ccaa9bf10f Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 20:13:26 +0200 Subject: [PATCH 2/7] stuff2 --- msys2/PKGBUILD.in | 2 +- src/ruisapp/application.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/msys2/PKGBUILD.in b/msys2/PKGBUILD.in index d441ce9..75c4802 100644 --- a/msys2/PKGBUILD.in +++ b/msys2/PKGBUILD.in @@ -55,7 +55,7 @@ prepare() { build() { cd "$rootDir" - make + make lint=off } check() { diff --git a/src/ruisapp/application.hpp b/src/ruisapp/application.hpp index d870235..248b27b 100644 --- a/src/ruisapp/application.hpp +++ b/src/ruisapp/application.hpp @@ -25,6 +25,7 @@ along with this program. If not, see . #include #include +#include #include #include #include From 21415e86578d3450b4197b91a0cf8e19c4d8b8c5 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 10:41:44 -0800 Subject: [PATCH 3/7] msvs: v143 configs --- msvs_solution/libruisapp/libruisapp.vcxproj | 202 +++++++++++++++++--- msvs_solution/libruisapp/packages.config | 28 +-- msvs_solution/msvs_solution.sln | 24 ++- msvs_solution/tests/packages.config | 28 +-- msvs_solution/tests/tests.vcxproj | 198 ++++++++++++++++--- msvs_solution/tests/tests.vcxproj.user | 16 ++ 6 files changed, 410 insertions(+), 86 deletions(-) diff --git a/msvs_solution/libruisapp/libruisapp.vcxproj b/msvs_solution/libruisapp/libruisapp.vcxproj index b0911da..7fab57c 100755 --- a/msvs_solution/libruisapp/libruisapp.vcxproj +++ b/msvs_solution/libruisapp/libruisapp.vcxproj @@ -49,6 +49,22 @@ v142_Release_MD x64 + + v143_Debug_MD + Win32 + + + v143_Debug_MD + x64 + + + v143_Release_MD + Win32 + + + v143_Release_MD + x64 + {1F656B83-1E51-406C-AF65-60249F4B2CB7} @@ -75,6 +91,12 @@ v142 MultiByte + + StaticLibrary + true + v143 + MultiByte + StaticLibrary false @@ -96,6 +118,13 @@ true MultiByte + + StaticLibrary + false + v143 + true + MultiByte + StaticLibrary true @@ -114,6 +143,12 @@ v142 MultiByte + + StaticLibrary + true + v143 + MultiByte + StaticLibrary false @@ -135,6 +170,13 @@ true MultiByte + + StaticLibrary + false + v143 + true + MultiByte + @@ -149,6 +191,9 @@ + + + @@ -158,6 +203,9 @@ + + + @@ -167,6 +215,9 @@ + + + @@ -176,19 +227,34 @@ + + + MultiThreadedDebugDLL + + MultiThreadedDebugDLL + MultiThreadedDebugDLL + + MultiThreadedDebugDLL + MultiThreadedDLL + + MultiThreadedDLL + MultiThreadedDLL + + MultiThreadedDLL + @@ -241,6 +307,24 @@ false + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + OldStyle + false + stdcpp17 + + + Windows + + + false + + @@ -293,6 +377,24 @@ false + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + OldStyle + false + stdcpp17 + + + Windows + + + false + + Level3 @@ -357,6 +459,28 @@ false + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + OldStyle + stdcpp17 + false + + + Windows + true + true + + + false + + Level3 @@ -421,6 +545,28 @@ false + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + OldStyle + stdcpp17 + false + + + Windows + true + true + + + false + + @@ -435,23 +581,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -459,22 +605,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvs_solution/libruisapp/packages.config b/msvs_solution/libruisapp/packages.config index 62b5d9d..43293e6 100755 --- a/msvs_solution/libruisapp/packages.config +++ b/msvs_solution/libruisapp/packages.config @@ -2,21 +2,21 @@ - - + + - - - - - - + + + + - - - - - - + + + + + + + + \ No newline at end of file diff --git a/msvs_solution/msvs_solution.sln b/msvs_solution/msvs_solution.sln index f783f19..38b1d62 100755 --- a/msvs_solution/msvs_solution.sln +++ b/msvs_solution/msvs_solution.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30717.126 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34607.119 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libruisapp", "libruisapp\libruisapp.vcxproj", "{1F656B83-1E51-406C-AF65-60249F4B2CB7}" EndProject @@ -21,6 +21,10 @@ Global v142_Debug_MD|x86 = v142_Debug_MD|x86 v142_Release_MD|x64 = v142_Release_MD|x64 v142_Release_MD|x86 = v142_Release_MD|x86 + v143_Debug_MD|x64 = v143_Debug_MD|x64 + v143_Debug_MD|x86 = v143_Debug_MD|x86 + v143_Release_MD|x64 = v143_Release_MD|x64 + v143_Release_MD|x86 = v143_Release_MD|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v140_Debug|x64.ActiveCfg = v140_Debug|x64 @@ -47,6 +51,14 @@ Global {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v142_Release_MD|x64.Build.0 = v142_Release_MD|x64 {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v142_Release_MD|x86.ActiveCfg = v142_Release_MD|Win32 {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v142_Release_MD|x86.Build.0 = v142_Release_MD|Win32 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Debug_MD|x64.ActiveCfg = v143_Debug_MD|x64 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Debug_MD|x64.Build.0 = v143_Debug_MD|x64 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Debug_MD|x86.ActiveCfg = v143_Debug_MD|Win32 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Debug_MD|x86.Build.0 = v143_Debug_MD|Win32 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Release_MD|x64.ActiveCfg = v143_Release_MD|x64 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Release_MD|x64.Build.0 = v143_Release_MD|x64 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Release_MD|x86.ActiveCfg = v143_Release_MD|Win32 + {1F656B83-1E51-406C-AF65-60249F4B2CB7}.v143_Release_MD|x86.Build.0 = v143_Release_MD|Win32 {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v140_Debug|x64.ActiveCfg = v140_Debug|x64 {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v140_Debug|x64.Build.0 = v140_Debug|x64 {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v140_Debug|x86.ActiveCfg = v140_Debug|Win32 @@ -71,6 +83,14 @@ Global {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v142_Release_MD|x64.Build.0 = v142_Release_MD|x64 {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v142_Release_MD|x86.ActiveCfg = v142_Release_MD|Win32 {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v142_Release_MD|x86.Build.0 = v142_Release_MD|Win32 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Debug_MD|x64.ActiveCfg = v143_Debug_MD|x64 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Debug_MD|x64.Build.0 = v143_Debug_MD|x64 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Debug_MD|x86.ActiveCfg = v143_Debug_MD|Win32 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Debug_MD|x86.Build.0 = v143_Debug_MD|Win32 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Release_MD|x64.ActiveCfg = v143_Release_MD|x64 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Release_MD|x64.Build.0 = v143_Release_MD|x64 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Release_MD|x86.ActiveCfg = v143_Release_MD|Win32 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8}.v143_Release_MD|x86.Build.0 = v143_Release_MD|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvs_solution/tests/packages.config b/msvs_solution/tests/packages.config index 62b5d9d..43293e6 100755 --- a/msvs_solution/tests/packages.config +++ b/msvs_solution/tests/packages.config @@ -2,21 +2,21 @@ - - + + - - - - - - + + + + - - - - - - + + + + + + + + \ No newline at end of file diff --git a/msvs_solution/tests/tests.vcxproj b/msvs_solution/tests/tests.vcxproj index 0118632..5ec3c26 100755 --- a/msvs_solution/tests/tests.vcxproj +++ b/msvs_solution/tests/tests.vcxproj @@ -49,6 +49,22 @@ v142_Release_MD x64 + + v143_Debug_MD + Win32 + + + v143_Debug_MD + x64 + + + v143_Release_MD + Win32 + + + v143_Release_MD + x64 + {7BBD68D9-FF3E-4779-A099-B52528FD8CA8} @@ -75,6 +91,12 @@ v142 MultiByte + + Application + true + v143 + MultiByte + Application false @@ -96,6 +118,13 @@ true MultiByte + + Application + false + v143 + true + MultiByte + Application true @@ -114,6 +143,12 @@ v142 MultiByte + + Application + true + v143 + MultiByte + Application false @@ -135,6 +170,13 @@ true MultiByte + + Application + false + v143 + true + MultiByte + @@ -149,6 +191,9 @@ + + + @@ -158,6 +203,9 @@ + + + @@ -167,6 +215,9 @@ + + + @@ -176,6 +227,9 @@ + + + true @@ -187,6 +241,10 @@ true MultiThreadedDebugDLL + + true + MultiThreadedDebugDLL + true @@ -197,6 +255,10 @@ true MultiThreadedDebugDLL + + true + MultiThreadedDebugDLL + false @@ -207,6 +269,10 @@ false MultiThreadedDLL + + false + MultiThreadedDLL + false @@ -217,6 +283,10 @@ false MultiThreadedDLL + + false + MultiThreadedDLL + @@ -263,6 +333,22 @@ OpenGl32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + ..\..\src;%(AdditionalIncludeDirectories) + + + Windows + true + OpenGl32.lib;%(AdditionalDependencies) + + @@ -309,6 +395,22 @@ OpenGl32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + ..\..\src;%(AdditionalIncludeDirectories) + + + Windows + true + OpenGl32.lib;%(AdditionalDependencies) + + Level3 @@ -367,6 +469,26 @@ OpenGl32.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + ..\..\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + OpenGl32.lib;%(AdditionalDependencies) + + Level3 @@ -425,6 +547,26 @@ OpenGl32.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + ..\..\src;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + OpenGl32.lib;%(AdditionalDependencies) + + @@ -440,23 +582,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -464,22 +606,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/msvs_solution/tests/tests.vcxproj.user b/msvs_solution/tests/tests.vcxproj.user index 840a9b6..0fdd8c7 100755 --- a/msvs_solution/tests/tests.vcxproj.user +++ b/msvs_solution/tests/tests.vcxproj.user @@ -12,6 +12,10 @@ $(ProjectDir)../../tests/app WindowsLocalDebugger + + $(ProjectDir)../../tests/app + WindowsLocalDebugger + $(ProjectDir)../../tests/app WindowsLocalDebugger @@ -24,6 +28,10 @@ $(ProjectDir)../../tests/app WindowsLocalDebugger + + $(ProjectDir)../../tests/app + WindowsLocalDebugger + $(ProjectDir)../../tests/app WindowsLocalDebugger @@ -36,6 +44,10 @@ $(ProjectDir)../../tests/app WindowsLocalDebugger + + $(ProjectDir)../../tests/app + WindowsLocalDebugger + $(ProjectDir)../../tests/app WindowsLocalDebugger @@ -48,4 +60,8 @@ $(ProjectDir)../../tests/app WindowsLocalDebugger + + $(ProjectDir)../../tests/app + WindowsLocalDebugger + \ No newline at end of file From b3f8570e57f5ad5bd58e6facb96685e5711be1f2 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 20:51:30 +0200 Subject: [PATCH 4/7] nuget: v143 --- nuget/build_nuget.ps1 | 29 +++++++++++++---------------- nuget/nuget.autopkg.in | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/nuget/build_nuget.ps1 b/nuget/build_nuget.ps1 index 890f2eb..f7c2e91 100644 --- a/nuget/build_nuget.ps1 +++ b/nuget/build_nuget.ps1 @@ -37,22 +37,19 @@ Get-ChildItem "." -Filter *.in | Foreach-Object{ # msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo # If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo -If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo -If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo -If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo -If(!$?){exit 1} -# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo -# If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} +# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} + +msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} +msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} +msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} Write-NuGetPackage nuget.autopkg If(!$?){exit 1} diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in index 5688bf7..a7bb7f0 100644 --- a/nuget/nuget.autopkg.in +++ b/nuget/nuget.autopkg.in @@ -2,7 +2,7 @@ configurations { UserPlatformToolset { // Needed because autopackage lacks VS2015+ support key = "PlatformToolset"; - choices: "v140,v141,v142"; + choices: "v140,v141,v142,v143"; }; RuntimeLibrary { @@ -26,7 +26,7 @@ nuget{ description: @"Intrusive C++ GUI library"; releaseNotes: "Initial release"; - copyright: Copyright 2016 Ivan Gagis; + copyright: Copyright 2016-2024 Ivan Gagis; tags: { native}; } dependencies { @@ -96,7 +96,7 @@ nuget{ lib: ..\msvs_solution\x64\v142_Debug_MT\libruisapp.lib; } */ - +/* [x86,v142,release,MultiThreadedDLL] { lib: ..\msvs_solution\v142_Release_MD\libruisapp.lib; } @@ -109,5 +109,35 @@ nuget{ [x64,v142,debug,MultiThreadedDebugDLL] { lib: ..\msvs_solution\x64\v142_Debug_MD\libruisapp.lib; } +*/ + + // ======== v143 ======== +/* + [x86,v143,release,MultiThreaded] { + lib: ..\msvs_solution\v143_Release_MT\libruisapp.lib; + } + [x86,v143,debug,MultiThreadedDebug] { + lib: ..\msvs_solution\v143_Debug_MT\libruisapp.lib; + } + [x64,v143,release,MultiThreaded] { + lib: ..\msvs_solution\x64\v143_Release_MT\libruisapp.lib; + } + [x64,v143,debug,MultiThreadedDebug] { + lib: ..\msvs_solution\x64\v143_Debug_MT\libruisapp.lib; + } +*/ + + [x86,v143,release,MultiThreadedDLL] { + lib: ..\msvs_solution\v143_Release_MD\libruisapp.lib; + } + [x86,v143,debug,MultiThreadedDebugDLL] { + lib: ..\msvs_solution\v143_Debug_MD\libruisapp.lib; + } + [x64,v143,release,MultiThreadedDLL] { + lib: ..\msvs_solution\x64\v143_Release_MD\libruisapp.lib; + } + [x64,v143,debug,MultiThreadedDebugDLL] { + lib: ..\msvs_solution\x64\v143_Debug_MD\libruisapp.lib; + } } } From c23426828cbc0a47d0a4653ce87bf8c841b3bf64 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 21:08:34 +0200 Subject: [PATCH 5/7] nuget: deps versions update --- nuget/nuget.autopkg.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in index a7bb7f0..f837bed 100644 --- a/nuget/nuget.autopkg.in +++ b/nuget/nuget.autopkg.in @@ -31,14 +31,14 @@ nuget{ } dependencies { packages : { - libr4/0.1.53; - libruis/0.5.210; - libruis-render-opengl/0.1.63; + libr4/1.0.79; + libruis/0.5.213; + libruis-render-opengl/0.1.65; glew.v140/1.12.0; - libpapki/1.0.93; - libopros/1.0.46; - libtreeml/0.1.28; - libutki/1.1.124; + libpapki/1.0.134; + libopros/1.0.91; + libtreeml/0.2.13; + libutki/1.1.228; }; } files { From 05d48b55cce29fbff019656b9b805ca6a385bb87 Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 11:11:38 -0800 Subject: [PATCH 6/7] nuget update --- msvs_solution/libruisapp/libruisapp.vcxproj | 4 ++-- msvs_solution/libruisapp/packages.config | 2 +- msvs_solution/tests/packages.config | 2 +- msvs_solution/tests/tests.vcxproj | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/msvs_solution/libruisapp/libruisapp.vcxproj b/msvs_solution/libruisapp/libruisapp.vcxproj index 7fab57c..5c0d322 100755 --- a/msvs_solution/libruisapp/libruisapp.vcxproj +++ b/msvs_solution/libruisapp/libruisapp.vcxproj @@ -597,7 +597,7 @@ - + @@ -621,6 +621,6 @@ - + \ No newline at end of file diff --git a/msvs_solution/libruisapp/packages.config b/msvs_solution/libruisapp/packages.config index 43293e6..c41300b 100755 --- a/msvs_solution/libruisapp/packages.config +++ b/msvs_solution/libruisapp/packages.config @@ -13,7 +13,7 @@ - + diff --git a/msvs_solution/tests/packages.config b/msvs_solution/tests/packages.config index 43293e6..c41300b 100755 --- a/msvs_solution/tests/packages.config +++ b/msvs_solution/tests/packages.config @@ -13,7 +13,7 @@ - + diff --git a/msvs_solution/tests/tests.vcxproj b/msvs_solution/tests/tests.vcxproj index 5ec3c26..7e67e5f 100755 --- a/msvs_solution/tests/tests.vcxproj +++ b/msvs_solution/tests/tests.vcxproj @@ -598,7 +598,7 @@ - + @@ -622,6 +622,6 @@ - + \ No newline at end of file From 1443a4ad8fbec2b2efe0e0841eeee6ccdbd4800b Mon Sep 17 00:00:00 2001 From: Ivan Gagis Date: Sun, 18 Feb 2024 21:14:28 +0200 Subject: [PATCH 7/7] release 0.2.90 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5a0520..982d61d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libruisapp (0.2.90) unstable; urgency=medium + + * msvs: v143 + + -- Ivan Gagis Sun, 18 Feb 2024 21:14:28 +0200 + libruisapp (0.2.89) unstable; urgency=medium * rename mordavokne to ruisapp