From ce780177b2e55f80f901cc7b245a10fe95586d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 4 Sep 2023 19:40:13 +0200 Subject: [PATCH] fixed #11910 - removed Visual Studio x86 targets from project files and builds from CI (#5397) Windows XP Pro x64 was released on April 25, 2005 and consumer processors supporting x86-64 have been around almost as long. Although there are still 32-bit Windows images available there is not much of a point maintaining support for these. We also never did any x86 builds for non-Windows platforms in CI so we don't even know if we work on those. You might still be able to build 32-bit binaries via CMake. --- .github/workflows/CI-windows.yml | 29 +--- cli/cli.vcxproj | 211 ----------------------------- cppcheck.sln | 44 +------ lib/cppcheck.vcxproj | 220 ------------------------------- releasenotes.txt | 3 +- test/testrunner.vcxproj | 212 ----------------------------- tools/dmake.cpp | 8 -- tools/dmake.vcxproj | 25 ++-- 8 files changed, 24 insertions(+), 728 deletions(-) diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index a822cccc5..d0bc46e29 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Visual Studio environment uses: ilammy/msvc-dev-cmd@v1 with: - arch: x64 # no 32-bit Qt available + arch: x64 - name: Install Qt ${{ matrix.qt_ver }} uses: jurplel/install-qt-action@v3 @@ -76,7 +76,6 @@ jobs: strategy: matrix: os: [windows-2019, windows-2022] - arch: [x64, x86] config: [debug, release] fail-fast: false @@ -99,7 +98,7 @@ jobs: - name: Set up Visual Studio environment uses: ilammy/msvc-dev-cmd@v1 with: - arch: ${{ matrix.arch }} + arch: x64 - name: Cache PCRE id: cache-pcre @@ -109,7 +108,7 @@ jobs: externals\pcre.h externals\pcre.lib externals\pcre64.lib - key: pcre-${{ env.PCRE_VERSION }}-${{ matrix.arch }}-bin-win + key: pcre-${{ env.PCRE_VERSION }}-x64-bin-win - name: Download PCRE if: steps.cache-pcre.outputs.cache-hit != 'true' @@ -124,11 +123,7 @@ jobs: cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off || exit /b !errorlevel! nmake || exit /b !errorlevel! copy pcre.h ..\externals || exit /b !errorlevel! - if "${{ matrix.arch }}" == "x86" ( - copy pcre.lib ..\externals\pcre.lib || exit /b !errorlevel! - ) else ( - copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel! - ) + copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel! env: CL: /MP @@ -143,21 +138,13 @@ jobs: - name: Run CMake if: false # TODO: enable run: | - set ARCH=${{ matrix.arch }} - if "${{ matrix.arch }}" == "x86" ( - set ARCH=Win32 - ) cmake -S . -B build -DBUILD_TESTS=On || exit /b !errorlevel! - name: Build CLI debug configuration using MSBuild if: matrix.config == 'debug' run: | - set ARCH=${{ matrix.arch }} - if "${{ matrix.arch }}" == "x86" ( - set ARCH=Win32 - ) :: cmake --build build --target check --config Debug || exit /b !errorlevel! - msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel! + msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel! - name: Run Debug test if: matrix.config == 'debug' @@ -166,12 +153,8 @@ jobs: - name: Build CLI release configuration using MSBuild if: matrix.config == 'release' run: | - set ARCH=${{ matrix.arch }} - if "${{ matrix.arch }}" == "x86" ( - set ARCH=Win32 - ) :: cmake --build build --target check --config Release || exit /b !errorlevel! - msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel! + msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel! - name: Run Release test if: matrix.config == 'release' diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj index 6e642479a..de4c330f7 100644 --- a/cli/cli.vcxproj +++ b/cli/cli.vcxproj @@ -1,34 +1,18 @@  - - Debug-PCRE - Win32 - Debug-PCRE x64 - - Debug - Win32 - Debug x64 - - Release-PCRE - Win32 - Release-PCRE x64 - - Release - Win32 - Release x64 @@ -40,18 +24,6 @@ 10.0 - - Application - Unicode - false - v142 - - - Application - Unicode - false - v142 - Application Unicode @@ -64,18 +36,6 @@ false v142 - - Application - Unicode - false - v142 - - - Application - Unicode - false - v142 - Application Unicode @@ -90,24 +50,12 @@ - - - - - - - - - - - - @@ -116,104 +64,25 @@ - $(SolutionDir)bin\debug\ - $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - cppcheck - cppcheck cppcheck cppcheck - true - true true true - $(SolutionDir)bin\ - $(SolutionDir)bin\ $(SolutionDir)bin\ $(SolutionDir)bin\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - cppcheck - cppcheck cppcheck cppcheck - true - true true true - true - true true true - - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - true - ProgramDatabase - Disabled - CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - true - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - $(OutDir)$(TargetName).pdb - true - 8000000 - 8000000 - - - - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - true - ProgramDatabase - Disabled - CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - true - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - true - 8000000 - 8000000 - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) @@ -272,82 +141,6 @@ true - - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - MaxSpeed - CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - AnySuitable - true - Speed - true - true - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - ProgramDatabase - true - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - true - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - true - true - true - true - 8000000 - 8000000 - - - - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - MaxSpeed - CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - AnySuitable - true - Speed - true - true - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - ProgramDatabase - true - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - true - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - true - true - true - true - 8000000 - 8000000 - - ..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) @@ -451,10 +244,6 @@ Create - Create - Create - Create - Create Create Create Create diff --git a/cppcheck.sln b/cppcheck.sln index 37be3fd4f..31272442c 100644 --- a/cppcheck.sln +++ b/cppcheck.sln @@ -19,76 +19,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dmake", "tools\dmake.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug-PCRE|Win32 = Debug-PCRE|Win32 Debug-PCRE|x64 = Debug-PCRE|x64 - Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release-PCRE|Win32 = Release-PCRE|Win32 Release-PCRE|x64 = Release-PCRE|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.ActiveCfg = Debug|Win32 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.Build.0 = Debug|Win32 {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.ActiveCfg = Debug|x64 {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.Build.0 = Debug|x64 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32 {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64 {35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.ActiveCfg = Release|Win32 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.Build.0 = Release|Win32 {35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.ActiveCfg = Release|x64 {35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.Build.0 = Release|x64 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32 - {35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32 {35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64 {35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.Build.0 = Release-PCRE|x64 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.Build.0 = Debug|Win32 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.ActiveCfg = Debug|x64 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.Build.0 = Debug|x64 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.ActiveCfg = Release|Win32 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.Build.0 = Release|Win32 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.ActiveCfg = Release|x64 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.Build.0 = Release|x64 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32 - {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64 {4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.Build.0 = Release-PCRE|x64 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.Build.0 = Debug|Win32 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.ActiveCfg = Debug|x64 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.Build.0 = Debug|x64 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.ActiveCfg = Release|Win32 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.Build.0 = Release|Win32 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.ActiveCfg = Release|x64 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.Build.0 = Release|x64 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32 - {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64 {C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.Build.0 = Release-PCRE|x64 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.ActiveCfg = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.Build.0 = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.ActiveCfg = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.Build.0 = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.ActiveCfg = Release|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.Build.0 = Release|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.ActiveCfg = Release|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.Build.0 = Release|Win32 - {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|Win32 + {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|x64 + {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|x64 + {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|x64 + {19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj index db5906ad8..4c3279625 100644 --- a/lib/cppcheck.vcxproj +++ b/lib/cppcheck.vcxproj @@ -1,33 +1,17 @@  - - Debug-PCRE - Win32 - Debug-PCRE x64 - - Debug - Win32 - Debug x64 - - Release-PCRE - Win32 - Release-PCRE x64 - - Release - Win32 - Release x64 @@ -40,10 +24,6 @@ Create - Create - Create - Create - Create Create Create Create @@ -194,18 +174,6 @@ 10.0 - - DynamicLibrary - Unicode - false - v142 - - - DynamicLibrary - Unicode - false - v142 - DynamicLibrary Unicode @@ -218,18 +186,6 @@ false v142 - - DynamicLibrary - Unicode - false - v142 - - - DynamicLibrary - Unicode - false - v142 - DynamicLibrary Unicode @@ -244,24 +200,12 @@ - - - - - - - - - - - - @@ -270,108 +214,25 @@ - $(SolutionDir)bin\debug\ - $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - cppcheck-core - cppcheck-core cppcheck-core cppcheck-core - false - false false false - $(SolutionDir)bin\ - $(SolutionDir)bin\ $(SolutionDir)bin\ $(SolutionDir)bin\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - cppcheck-core - cppcheck-core cppcheck-core cppcheck-core - false - false false false - true - true true true - - - ProgramDatabase - true - Disabled - CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - Level4 - ..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - MultiThreadedDebugDLL - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - - - ../externals;%(AdditionalLibraryDirectories) - true - true - - - true - 8000000 - 8000000 - - - xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y -xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y -xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y - - - - - ProgramDatabase - true - Disabled - CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) - Level4 - ..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - MultiThreadedDebugDLL - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - - - pcre.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - true - true - 8000000 - 8000000 - - - xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y -xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y -xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y - - ProgramDatabase @@ -432,87 +293,6 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y -xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y - - - - - MaxSpeed - Level4 - AnySuitable - true - Speed - true - true - true - ..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - true - false - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - - - ../externals;%(AdditionalLibraryDirectories) - true - true - true - true - true - 8000000 - 8000000 - - - xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y -xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y -xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y - - - - - MaxSpeed - Level4 - AnySuitable - true - Speed - true - true - true - ..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) - MultiThreadedDLL - ProgramDatabase - true - false - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - - - pcre.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - true - true - true - true - 8000000 - 8000000 - - - xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y -xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y diff --git a/releasenotes.txt b/releasenotes.txt index e302a8481..4d75b6445 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -24,4 +24,5 @@ Deprecations: Other: - "USE_QT6=On" will no longer fallback to Qt5 when Qt6 is not found. -- When the execution of an addon fails with an exitcode it will now result in an 'internalError' instead of being silently ignored. \ No newline at end of file +- When the execution of an addon fails with an exitcode it will now result in an 'internalError' instead of being silently ignored. +- "Win32" configurations have been removed from the bundled Visual Studio solution and projects. You might still be able to build 32-bit binaries using CMake but that is untested and unmaintained. \ No newline at end of file diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj index b0ed00c2f..ffc2dae47 100755 --- a/test/testrunner.vcxproj +++ b/test/testrunner.vcxproj @@ -1,34 +1,18 @@ - - Debug-PCRE - Win32 - Debug-PCRE x64 - - Debug - Win32 - Debug x64 - - Release-PCRE - Win32 - Release-PCRE x64 - - Release - Win32 - Release x64 @@ -52,10 +36,6 @@ Create - Create - Create - Create - Create Create Create Create @@ -153,18 +133,6 @@ 10.0 - - Application - Unicode - false - v142 - - - Application - Unicode - false - v142 - Application Unicode @@ -177,18 +145,6 @@ false v142 - - Application - Unicode - false - v142 - - - Application - Unicode - false - v142 - Application Unicode @@ -203,24 +159,12 @@ - - - - - - - - - - - - @@ -229,103 +173,25 @@ - $(SolutionDir)bin\debug\ - $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ $(SolutionDir)bin\debug\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - testrunner - testrunner testrunner testrunner - true - true true true - $(SolutionDir)bin\ - $(SolutionDir)bin\ $(SolutionDir)bin\ $(SolutionDir)bin\ - temp\$(Configuration)_$(PlatformName)\ - temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ temp\$(Configuration)_$(PlatformName)\ - testrunner - testrunner testrunner testrunner - true - true true true - true - true true true - - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - true - ProgramDatabase - Disabled - CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - true - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - EnableFastChecks - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - true - 8000000 - 8000000 - - - - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - true - ProgramDatabase - Disabled - CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Level4 - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - true - Use - precompiled.h - precompiled.h - true - stdcpp14 - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - EnableFastChecks - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - true - Console - true - true - 8000000 - 8000000 - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) @@ -384,84 +250,6 @@ true - - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - MaxSpeed - CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - AnySuitable - true - Speed - true - true - true - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - ProgramDatabase - true - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - false - Console - true - true - true - true - true - 8000000 - 8000000 - true - - - - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) - false - MaxSpeed - CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) - MultiThreadedDLL - Level4 - AnySuitable - true - Speed - true - true - true - 4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805 - ProgramDatabase - true - Use - precompiled.h - precompiled.h - /Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions) - true - stdcpp14 - - - shlwapi.lib;%(AdditionalDependencies) - ../externals;%(AdditionalLibraryDirectories) - false - Console - true - true - true - true - true - 8000000 - 8000000 - true - - ..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index 4c4c6fa1b..bc0c7a064 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -233,14 +233,6 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type) outstr += "\r\n"; outstr += R"( Create)"; outstr += "\r\n"; - outstr += R"( Create)"; - outstr += "\r\n"; - outstr += R"( Create)"; - outstr += "\r\n"; - outstr += R"( Create)"; - outstr += "\r\n"; - outstr += R"( Create)"; - outstr += "\r\n"; outstr += R"( Create)"; outstr += "\r\n"; outstr += R"( Create)"; diff --git a/tools/dmake.vcxproj b/tools/dmake.vcxproj index 5c50dcb32..e6d7f14a6 100644 --- a/tools/dmake.vcxproj +++ b/tools/dmake.vcxproj @@ -1,29 +1,28 @@  - + Debug - Win32 + x64 - + Release - Win32 + x64 {19EC86CD-0004-4917-B852-E6BD110B6E6F} dmake - Win32Proj 10.0 - + Application v142 NotSet true - + Application v142 NotSet @@ -31,28 +30,28 @@ - + - + <_ProjectFileVersion>11.0.61030.0 - + ..\Build\$(Configuration)\ ..\BuildTmp\$(TargetName)\$(Configuration)\ true - + ..\Build\$(Configuration)\ ..\BuildTmp\$(TargetName)\$(Configuration)\ false - + Disabled ..\lib;..\externals\simplecpp;%(AdditionalIncludeDirectories) @@ -74,7 +73,7 @@ MachineX86 - + MaxSpeed true