From 873026d9098e560ed24a5dabc94e7e20bfeb1388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Negru=C8=9Biu?= Date: Sat, 18 May 2024 20:25:55 +0300 Subject: [PATCH] GH-19: Refactored vcxproj configurations to standard Debug|Release|Win32|x64 Easier x64 debugging --- Directory.Build.props | 3 ++ NScurl.sln | 28 +++++------ _build_Release.cmd | 13 ++++-- _build_Release_mingw.bat | 2 +- src/nscurl/NScurl.vcxproj | 85 ++++++++++++++++++---------------- src/nscurl/NScurl.vcxproj.user | 18 +++---- 6 files changed, 80 insertions(+), 69 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2b9277f..7ca6772 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,6 +6,9 @@ x64-windows-static $(SolutionDir)vcpkg\$(VcpkgTriplet)\ $(VcpkgRootDir)installed\$(VcpkgTriplet)\ + + x86 + amd64 diff --git a/NScurl.sln b/NScurl.sln index ace73bf..ed7b428 100644 --- a/NScurl.sln +++ b/NScurl.sln @@ -1,26 +1,26 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.902 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NScurl", "src\nscurl\NScurl.vcxproj", "{FE51110F-82BE-423E-800C-F5951C998D22}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-x86-ansi|Win32 = Debug-x86-ansi|Win32 - Debug-x86-unicode|Win32 = Debug-x86-unicode|Win32 - Release-x86-ansi|Win32 = Release-x86-ansi|Win32 - Release-x86-unicode|Win32 = Release-x86-unicode|Win32 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FE51110F-82BE-423E-800C-F5951C998D22}.Debug-x86-ansi|Win32.ActiveCfg = Debug-x86-ansi|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Debug-x86-ansi|Win32.Build.0 = Debug-x86-ansi|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Debug-x86-unicode|Win32.ActiveCfg = Debug-x86-unicode|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Debug-x86-unicode|Win32.Build.0 = Debug-x86-unicode|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Release-x86-ansi|Win32.ActiveCfg = Release-x86-ansi|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Release-x86-ansi|Win32.Build.0 = Release-x86-ansi|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Release-x86-unicode|Win32.ActiveCfg = Release-x86-unicode|Win32 - {FE51110F-82BE-423E-800C-F5951C998D22}.Release-x86-unicode|Win32.Build.0 = Release-x86-unicode|Win32 + {FE51110F-82BE-423E-800C-F5951C998D22}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE51110F-82BE-423E-800C-F5951C998D22}.Debug|Win32.Build.0 = Debug|Win32 + {FE51110F-82BE-423E-800C-F5951C998D22}.Debug|x64.ActiveCfg = Debug|x64 + {FE51110F-82BE-423E-800C-F5951C998D22}.Debug|x64.Build.0 = Debug|x64 + {FE51110F-82BE-423E-800C-F5951C998D22}.Release|Win32.ActiveCfg = Release|Win32 + {FE51110F-82BE-423E-800C-F5951C998D22}.Release|Win32.Build.0 = Release|Win32 + {FE51110F-82BE-423E-800C-F5951C998D22}.Release|x64.ActiveCfg = Release|x64 + {FE51110F-82BE-423E-800C-F5951C998D22}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/_build_Release.cmd b/_build_Release.cmd index 669b99f..3f485d9 100644 --- a/_build_Release.cmd +++ b/_build_Release.cmd @@ -19,6 +19,7 @@ echo Building vcpkg ... start "vcpkg x86" cmd /C _build_vcpkg.bat Win32 msvc start "vcpkg x64" cmd /C _build_vcpkg.bat x64 msvc ) | set /P "=" +echo. :DEFINITIONS @@ -46,10 +47,14 @@ pushd "%CD%" call "%VCVARSALL%" x86 popd -title %BUILD_CONFIG%-x86-ansi -msbuild /m /t:build "%BUILD_SOLUTION%" /p:Configuration=%BUILD_CONFIG%-x86-ansi /p:Platform=Win32 /p:PlatformToolset=%BUILD_PLATFORMTOOLSET% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /nologo /verbosity:%BUILD_VERBOSITY% -if %errorlevel% neq 0 pause && exit /B %errorlevel% +REM title %BUILD_CONFIG%-x86-ansi +REM msbuild /m /t:build "%BUILD_SOLUTION%" /p:Configuration=%BUILD_CONFIG%-x86-ansi /p:Platform=Win32 /p:PlatformToolset=%BUILD_PLATFORMTOOLSET% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /nologo /verbosity:%BUILD_VERBOSITY% +REM if %errorlevel% neq 0 pause && exit /B %errorlevel% title %BUILD_CONFIG%-x86-unicode -msbuild /m /t:build "%BUILD_SOLUTION%" /p:Configuration=%BUILD_CONFIG%-x86-unicode /p:Platform=Win32 /p:PlatformToolset=%BUILD_PLATFORMTOOLSET% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /nologo /verbosity:%BUILD_VERBOSITY% +msbuild /m /t:build "%BUILD_SOLUTION%" /p:Configuration=%BUILD_CONFIG% /p:Platform=Win32 /p:PlatformToolset=%BUILD_PLATFORMTOOLSET% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /nologo /verbosity:%BUILD_VERBOSITY% +if %errorlevel% neq 0 pause && exit /B %errorlevel% + +title %BUILD_CONFIG%-amd64-unicode +msbuild /m /t:build "%BUILD_SOLUTION%" /p:Configuration=%BUILD_CONFIG% /p:Platform=x64 /p:PlatformToolset=%BUILD_PLATFORMTOOLSET% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /nologo /verbosity:%BUILD_VERBOSITY% if %errorlevel% neq 0 pause && exit /B %errorlevel% diff --git a/_build_Release_mingw.bat b/_build_Release_mingw.bat index a41c941..0647944 100644 --- a/_build_Release_mingw.bat +++ b/_build_Release_mingw.bat @@ -26,7 +26,7 @@ echo Building vcpkg ... start "vcpkg x86" cmd /C _build_vcpkg.bat Win32 mingw start "vcpkg x64" cmd /C _build_vcpkg.bat x64 mingw ) | set /P "=" - +echo. :x86 if not exist "%MINGW32%\bin\gcc.exe" echo ERROR: Missing "%MINGW32%" && pause && exit /B 2 diff --git a/src/nscurl/NScurl.vcxproj b/src/nscurl/NScurl.vcxproj index d425ef7..1781630 100644 --- a/src/nscurl/NScurl.vcxproj +++ b/src/nscurl/NScurl.vcxproj @@ -1,21 +1,21 @@  - - Debug-x86-ansi + + Debug Win32 - - Debug-x86-unicode - Win32 + + Debug + x64 - - Release-x86-ansi + + Release Win32 - - Release-x86-unicode - Win32 + + Release + x64 @@ -25,89 +25,95 @@ 10.0 - + DynamicLibrary - true v143 - MultiByte + true + Unicode - + DynamicLibrary - true v143 + true Unicode - + DynamicLibrary false v143 true - MultiByte + Unicode - + DynamicLibrary false v143 - Unicode true + Unicode - + - + - + - + - - $(SolutionDir)$(Configuration)\temp\ + + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\temp\ + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\ + false - - $(SolutionDir)$(Configuration)\temp\ + + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\temp\ + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\ + false - - $(SolutionDir)$(Configuration)\temp\ + + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\ + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\temp\ false - false - - $(SolutionDir)$(Configuration)\temp\ - false + + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\ + $(SolutionDir)$(Configuration)-msvc-$(PlatformNsis)-unicode\temp\ false - + Level3 WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug Windows version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies) - + Level3 WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug Windows version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies) - + Level3 @@ -115,24 +121,21 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) StreamingSIMDExtensions MultiThreaded - Size Windows + true true version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies) - true - + Level3 WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - StreamingSIMDExtensions MultiThreaded - Size Windows diff --git a/src/nscurl/NScurl.vcxproj.user b/src/nscurl/NScurl.vcxproj.user index 6be18f9..8dbca8f 100644 --- a/src/nscurl/NScurl.vcxproj.user +++ b/src/nscurl/NScurl.vcxproj.user @@ -1,23 +1,23 @@  - - $(SolutionDir)tests\NScurl-Debug-x86-ansi.exe + + $(SolutionDir)tests\NScurl-Debug-$(PlatformNsis)-unicode.exe WindowsLocalDebugger /dll "$(TargetPath)" - - $(SolutionDir)tests\NScurl-Debug-x86-unicode.exe + + $(SolutionDir)tests\NScurl-Debug-$(PlatformNsis)-unicode.exe WindowsLocalDebugger /dll "$(TargetPath)" - - $(SolutionDir)tests\NScurl-Debug-x86-unicode.exe + + $(SolutionDir)tests\NScurl-Debug-$(PlatformNsis)-unicode.exe WindowsLocalDebugger /dll "$(TargetPath)" - - /dll "$(TargetPath)" + + $(SolutionDir)tests\NScurl-Debug-$(PlatformNsis)-unicode.exe WindowsLocalDebugger - $(SolutionDir)tests\NScurl-Debug-x86-ansi.exe + /dll "$(TargetPath)" \ No newline at end of file