diff --git a/Kiwano.sln b/Kiwano.sln index 385e15c0..ab0d2174 100644 --- a/Kiwano.sln +++ b/Kiwano.sln @@ -21,77 +21,42 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|Win32.ActiveCfg = Debug|Win32 {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|Win32.Build.0 = Debug|Win32 - {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|x64.ActiveCfg = Debug|x64 - {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Debug|x64.Build.0 = Debug|x64 {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|Win32.ActiveCfg = Release|Win32 {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|Win32.Build.0 = Release|Win32 - {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|x64.ActiveCfg = Release|x64 - {3561A359-F9FD-48AB-A977-34E7E568BC8E}.Release|x64.Build.0 = Release|x64 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.ActiveCfg = Debug|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Build.0 = Debug|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|Win32.Deploy.0 = Debug|Win32 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.ActiveCfg = Debug|x64 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Build.0 = Debug|x64 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Debug|x64.Deploy.0 = Debug|x64 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.ActiveCfg = Release|Win32 {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|Win32.Build.0 = Release|Win32 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.ActiveCfg = Release|x64 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF}.Release|x64.Build.0 = Release|x64 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.ActiveCfg = Debug|Win32 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|Win32.Build.0 = Debug|Win32 - {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|x64.ActiveCfg = Debug|x64 - {45F5738D-CDF2-4024-974D-25B64F9043DE}.Debug|x64.Build.0 = Debug|x64 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Release|Win32.ActiveCfg = Release|Win32 {45F5738D-CDF2-4024-974D-25B64F9043DE}.Release|Win32.Build.0 = Release|Win32 - {45F5738D-CDF2-4024-974D-25B64F9043DE}.Release|x64.ActiveCfg = Release|x64 - {45F5738D-CDF2-4024-974D-25B64F9043DE}.Release|x64.Build.0 = Release|x64 {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.ActiveCfg = Debug|Win32 {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|Win32.Build.0 = Debug|Win32 - {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|x64.ActiveCfg = Debug|x64 - {6152D36C-EA40-4968-A696-244B6CA58395}.Debug|x64.Build.0 = Debug|x64 {6152D36C-EA40-4968-A696-244B6CA58395}.Release|Win32.ActiveCfg = Release|Win32 {6152D36C-EA40-4968-A696-244B6CA58395}.Release|Win32.Build.0 = Release|Win32 - {6152D36C-EA40-4968-A696-244B6CA58395}.Release|x64.ActiveCfg = Release|x64 - {6152D36C-EA40-4968-A696-244B6CA58395}.Release|x64.Build.0 = Release|x64 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Debug|Win32.ActiveCfg = Debug|Win32 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Debug|Win32.Build.0 = Debug|Win32 - {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Debug|x64.ActiveCfg = Debug|x64 - {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Debug|x64.Build.0 = Debug|x64 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|Win32.ActiveCfg = Release|Win32 {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|Win32.Build.0 = Release|Win32 - {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.ActiveCfg = Release|x64 - {324CFF47-4EB2-499A-BE5F-53A82E3BA14B}.Release|x64.Build.0 = Release|x64 {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.ActiveCfg = Debug|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|Win32.Build.0 = Debug|Win32 - {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|x64.ActiveCfg = Debug|x64 - {1B97937D-8184-426C-BE71-29A163DC76C9}.Debug|x64.Build.0 = Debug|x64 {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.ActiveCfg = Release|Win32 {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|Win32.Build.0 = Release|Win32 - {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|x64.ActiveCfg = Release|x64 - {1B97937D-8184-426C-BE71-29A163DC76C9}.Release|x64.Build.0 = Release|x64 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.ActiveCfg = Debug|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|Win32.Build.0 = Debug|Win32 - {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|x64.ActiveCfg = Debug|x64 - {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Debug|x64.Build.0 = Debug|x64 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.ActiveCfg = Release|Win32 {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|Win32.Build.0 = Release|Win32 - {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|x64.ActiveCfg = Release|x64 - {69DFBE92-C06F-4CF8-9495-CA9BF2E3BAF2}.Release|x64.Build.0 = Release|x64 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.ActiveCfg = Debug|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|Win32.Build.0 = Debug|Win32 - {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|x64.ActiveCfg = Debug|x64 - {A7062ED8-8910-48A5-A3BC-C1612672571F}.Debug|x64.Build.0 = Debug|x64 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.ActiveCfg = Release|Win32 {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|Win32.Build.0 = Release|Win32 - {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|x64.ActiveCfg = Release|x64 - {A7062ED8-8910-48A5-A3BC-C1612672571F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.yml b/appveyor.yml index 62e3b7ba..0ca18dc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,6 @@ configuration: - Release platform: - Win32 -- x64 before_build: - ps: nuget restore build: diff --git a/kiwano-audio/kiwano-audio.vcxproj b/kiwano-audio/kiwano-audio.vcxproj index 5d40f0e0..c0ff43c9 100644 --- a/kiwano-audio/kiwano-audio.vcxproj +++ b/kiwano-audio/kiwano-audio.vcxproj @@ -24,14 +24,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {1B97937D-8184-426C-BE71-29A163DC76C9} @@ -61,29 +53,6 @@ v141 v142 - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -95,50 +64,22 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 Disabled - false - ../ - - - Windows - true - - - - - Level3 - Disabled - false + true ../ @@ -153,24 +94,7 @@ true true false - false - ../ - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - false - false + true ../ diff --git a/kiwano-imgui/kiwano-imgui.vcxproj b/kiwano-imgui/kiwano-imgui.vcxproj index 6e2de069..a334d7fd 100644 --- a/kiwano-imgui/kiwano-imgui.vcxproj +++ b/kiwano-imgui/kiwano-imgui.vcxproj @@ -33,14 +33,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {A7062ED8-8910-48A5-A3BC-C1612672571F} @@ -70,29 +62,6 @@ v141 v142 - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -104,12 +73,6 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ @@ -121,33 +84,11 @@ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 Disabled - false - ../ - - - Windows - true - - - - - Level3 - Disabled - false + true ../ @@ -162,24 +103,7 @@ true true false - false - ../ - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - false - false + true ../ diff --git a/kiwano-network/kiwano-network.vcxproj b/kiwano-network/kiwano-network.vcxproj index 03b2f7c8..b78c5be9 100644 --- a/kiwano-network/kiwano-network.vcxproj +++ b/kiwano-network/kiwano-network.vcxproj @@ -19,14 +19,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - @@ -59,29 +51,6 @@ v141 v142 - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -93,50 +62,22 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 Disabled - false - ../ - - - Windows - true - - - - - Level3 - Disabled - false + true ../ @@ -151,24 +92,7 @@ true true false - false - ../ - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - false - false + true ../ diff --git a/kiwano/Kiwano.vcxproj b/kiwano/Kiwano.vcxproj index 67f4467a..a2fefe66 100644 --- a/kiwano/Kiwano.vcxproj +++ b/kiwano/Kiwano.vcxproj @@ -135,18 +135,10 @@ Debug Win32 - - Debug - x64 - Release Win32 - - Release - x64 - {FF7F943D-A89C-4E6C-97CF-84F7D8FF8EDF} @@ -164,17 +156,6 @@ v141 v142 - - StaticLibrary - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - StaticLibrary false @@ -187,70 +168,31 @@ v141 v142 - - StaticLibrary - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 Disabled - false - - - Windows - true - - - - - Level3 - Disabled - false + true Windows @@ -264,23 +206,7 @@ true true false - false - - - Windows - true - true - true - - - - - Level3 - MaxSpeed - true - true - false - false + true Windows diff --git a/samples/Box2DSample/Box2DSample.vcxproj b/samples/Box2DSample/Box2DSample.vcxproj index 976a0f68..2f5bfa92 100644 --- a/samples/Box2DSample/Box2DSample.vcxproj +++ b/samples/Box2DSample/Box2DSample.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {324CFF47-4EB2-499A-BE5F-53A82E3BA14B} @@ -46,29 +38,6 @@ v141 v142 - - Application - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -80,33 +49,17 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 @@ -119,18 +72,6 @@ Windows - - - Level3 - Disabled - true - ../..; - - - true - Windows - - Level3 @@ -147,22 +88,6 @@ Windows - - - Level3 - MaxSpeed - true - true - true - ../..; - - - true - true - true - Windows - - diff --git a/samples/HelloWorld/HelloWorld.vcxproj b/samples/HelloWorld/HelloWorld.vcxproj index ffed7947..c77125e5 100644 --- a/samples/HelloWorld/HelloWorld.vcxproj +++ b/samples/HelloWorld/HelloWorld.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {3561A359-F9FD-48AB-A977-34E7E568BC8E} @@ -46,29 +38,6 @@ v141 v142 - - Application - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -80,33 +49,17 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 @@ -120,19 +73,6 @@ Windows - - - Level3 - Disabled - true - true - ../..; - - - true - Windows - - Level3 @@ -150,23 +90,6 @@ Windows - - - Level3 - MaxSpeed - true - true - true - true - ../..; - - - true - true - true - Windows - - diff --git a/samples/ImGuiSample/ImGuiSample.vcxproj b/samples/ImGuiSample/ImGuiSample.vcxproj index 0b3795a3..8eb1716b 100644 --- a/samples/ImGuiSample/ImGuiSample.vcxproj +++ b/samples/ImGuiSample/ImGuiSample.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {6152D36C-EA40-4968-A696-244B6CA58395} @@ -46,29 +38,6 @@ v141 v142 - - Application - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -80,33 +49,17 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 @@ -119,18 +72,6 @@ Windows - - - Level3 - Disabled - true - ../..; - - - true - Windows - - Level3 @@ -147,22 +88,6 @@ Windows - - - Level3 - MaxSpeed - true - true - true - ../..; - - - true - true - true - Windows - - diff --git a/samples/Samples/Samples.vcxproj b/samples/Samples/Samples.vcxproj index 45d821b8..28d48970 100644 --- a/samples/Samples/Samples.vcxproj +++ b/samples/Samples/Samples.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {45F5738D-CDF2-4024-974D-25B64F9043DE} @@ -46,29 +38,6 @@ v141 v142 - - Application - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - - - Application - false - true - Unicode - v100 - v110 - v120 - v140 - v141 - v142 - @@ -80,33 +49,17 @@ - - - - - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ true - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - true - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ false - - $(ProjectDir)\output\$(Configuration).$(Platform).$(PlatformToolset)\ - $(ProjectDir)\build\$(Configuration).$(Platform).$(PlatformToolset)\ - false - Level3 @@ -126,25 +79,6 @@ Copy files - - - Level3 - Disabled - true - ../..; - - - true - Windows - - - - xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y - xcopy "$(ProjectDir)..\..\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y - - Copy files - - Level3 @@ -168,29 +102,6 @@ Copy files - - - Level3 - MaxSpeed - true - true - true - ../..; - - - true - true - true - Windows - - - - xcopy "$(ProjectDir)\res" "$(OutDir)\res\" /D /E /I /F /Y - xcopy "$(ProjectDir)..\..\kiwano-network\dlls\*.dll" "$(OutDir)" /D /Y - - Copy files - -