#5778: Adjust property sheets to use windeps/ instead of w32deps/w64deps

radiant/darkradiant.rc

@@ -1,4 +1,4 @@
-#include "../w32deps/wxWidgets/include/wx/msw/wx.rc"
+#include "../windeps/wxWidgets/include/wx/msw/wx.rc"
 #include "../include/version.h"
 
 //Microsoft Developer Studio generated resource script.

tools/msvc/DarkRadiant.vcxproj

@@ -116,7 +116,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(W32DepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <DataExecutionPrevention>
@@ -139,7 +139,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(W32DepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <DataExecutionPrevention>
@@ -157,7 +157,7 @@
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(W32DepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <DataExecutionPrevention>
@@ -178,7 +178,7 @@
     </ClCompile>
     <ResourceCompile>
       <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(W32DepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -601,7 +601,12 @@
     <ClInclude Include="..\..\radiant\log\PopupErrorHandler.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\radiant\darkradiant.rc" />
+    <ResourceCompile Include="..\..\radiant\darkradiant.rc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(WinDepsDir)wxWidgets/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="wxutillib.vcxproj">

tools/msvc/post_build_event_x64.cmd

@@ -2,39 +2,39 @@ for %%i in (..\..\install\*.dll) do del "%%i"
 
 del ..\..\install\python*.zip
 
-copy ..\..\w64deps\openal\bin\OpenAL32.dll ..\..\install /Y
-copy ..\..\w64deps\openal\bin\wrap_oal.dll ..\..\install /Y
-copy ..\..\w64deps\glew\bin\glew32.dll ..\..\install /Y
-copy ..\..\w64deps\python\bin\python3*.dll ..\..\install /Y
-copy ..\..\w64deps\python\bin\python3*.zip ..\..\install /Y
+copy ..\..\windeps\openal\bin\OpenAL32.dll ..\..\install /Y
+copy ..\..\windeps\openal\bin\wrap_oal.dll ..\..\install /Y
+copy ..\..\windeps\glew\bin\glew32.dll ..\..\install /Y
+copy ..\..\windeps\python\bin\python3*.dll ..\..\install /Y
+copy ..\..\windeps\python\bin\python3*.zip ..\..\install /Y
 
 @rem Copy wxWidgets libraries (64 bit)
 
 IF "%1" == "Debug" (SET WXLIB_SUFFIX=ud) ELSE (SET WXLIB_SUFFIX=u)
 
 @echo Copying wxWidgets binaries
 
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_gl_vc*_x64.dll	   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_html_vc*_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_xrc_vc*_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_stc_vc*_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_vc*_x64.dll	   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_xml_vc*_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_adv_vc*_x64.dll   ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_core_vc*_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_aui_vc*_x64.dll  ..\..\install /Y
-copy ..\..\w64deps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_net_vc*_x64.dll  ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_gl_vc*_x64.dll	   ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_html_vc*_x64.dll  ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_xrc_vc*_x64.dll   ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_stc_vc*_x64.dll   ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_vc*_x64.dll	   ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_xml_vc*_x64.dll  ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_adv_vc*_x64.dll   ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_core_vc*_x64.dll  ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxmsw313%WXLIB_SUFFIX%_aui_vc*_x64.dll  ..\..\install /Y
+copy ..\..\windeps\wxWidgets\bin\wxbase313%WXLIB_SUFFIX%_net_vc*_x64.dll  ..\..\install /Y
 
 IF "%1" == "Debug" (SET DEBUG_SUFFIX=-d) ELSE (SET DEBUG_SUFFIX=)
 
 @echo Copying FTGL library (64 bit)
-copy ..\..\w64deps\ftgl\bin\ftgl%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
+copy ..\..\windeps\ftgl\bin\ftgl%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
 
 @echo Copying sigc++ library (64 bit)
-copy "..\..\w64deps\libsigc++\bin\libsigc++%DEBUG_SUFFIX%-%2.dll" ..\..\install /Y
+copy "..\..\windeps\libsigc++\bin\libsigc++%DEBUG_SUFFIX%-%2.dll" ..\..\install /Y
 
 @echo Copying libxml2 library (64 bit)
-copy ..\..\w64deps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
+copy ..\..\windeps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
 
 @echo Copying libgit2 library (64-bit)
-copy ..\..\w64deps\libgit2\bin\libgit2%DEBUG_SUFFIX%.dll ..\..\install /Y
+copy ..\..\windeps\libgit2\bin\libgit2%DEBUG_SUFFIX%.dll ..\..\install /Y

tools/msvc/properties/DarkRadiant Base Debug x64.props

@@ -4,7 +4,7 @@
     <Import Project="DarkRadiant Base.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <PlatformDepsDir>$(DarkRadiantRoot)\w64deps\</PlatformDepsDir>
+    <PlatformDepsDir>$(DarkRadiantRoot)\windeps\</PlatformDepsDir>
     <LibSuffix>-d</LibSuffix>
     <WxWidgetsLibDir>vc14x_x64_dll</WxWidgetsLibDir>
   </PropertyGroup>

tools/msvc/properties/DarkRadiant Base.props

@@ -5,14 +5,15 @@
     <DarkRadiantRoot>$(SolutionDir)</DarkRadiantRoot>
     <W32DepsDir>$(DarkRadiantRoot)w32deps\</W32DepsDir>
     <W64DepsDir>$(DarkRadiantRoot)w64deps\</W64DepsDir>
+    <WinDepsDir>$(DarkRadiantRoot)windeps\</WinDepsDir>
   </PropertyGroup>
   <PropertyGroup>
     <IntDir>$(DarkRadiantRoot)build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(W32DepsDir)libeigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(WinDepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(WinDepsDir)libeigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;FMT_HEADER_ONLY;FMT_USE_WINDOWS_H=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -46,5 +47,8 @@
     <BuildMacro Include="W64DepsDir">
       <Value>$(W64DepsDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="WinDepsDir">
+      <Value>$(WinDepsDir)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>

tools/msvc/properties/GLEW.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\glew\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)\glew\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(PlatformDepsDir)\glew\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

tools/msvc/properties/OpenAL + Vorbis.props

@@ -9,7 +9,7 @@
       <AdditionalDependencies>libvorbis$(LibSuffix)-vc$(PlatformToolsetVersion).lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\openal\include;$(DarkRadiantRoot)\w32deps\openal\include\AL;$(DarkRadiantRoot)\w32deps\libvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)openal\include;$(WinDepsDir)openal\include\AL;$(WinDepsDir)libvorbis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

tools/msvc/properties/Python.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\python\include;$(DarkRadiantRoot)\libs\pybind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)python\include;$(DarkRadiantRoot)\libs\pybind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_ACOSH;HAVE_ASINH;HAVE_ATANH;HAVE_LOG1P;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>

tools/msvc/properties/ftgl.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(W32DepsDir)ftgl\include;$(W32DepsDir)freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)ftgl\include;$(WinDepsDir)freetype\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ftgl$(LibSuffix)-vc$(PlatformToolsetVersion).lib</AdditionalDependencies>

tools/msvc/properties/libgit2.props

@@ -5,10 +5,10 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(W32DepsDir)libgit2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)libgit2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libgit2$(LibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libgit2$(LibSuffix).lib;winhttp.lib;crypt32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(PlatformDepsDir)\libgit2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>

tools/msvc/properties/libjpeg.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\libjpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)libjpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libjpeg$(LibSuffix)-vc$(PlatformToolsetVersion).lib;%(AdditionalDependencies)</AdditionalDependencies>

tools/msvc/properties/libpng.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\libpng\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)libpng\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link />
     <Link>

tools/msvc/properties/libxml2.props

@@ -9,7 +9,7 @@
       <AdditionalLibraryDirectories>$(PlatformDepsDir)\libxml2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

tools/msvc/properties/win_iconv.props

@@ -14,7 +14,7 @@
     </Lib>
     <ClCompile />
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\win_iconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)win_iconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

tools/msvc/properties/wxWidgets.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(W32DepsDir)wxWidgets\include;$(W32DepsDir)wxWidgets\include\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)wxWidgets\include;$(WinDepsDir)wxWidgets\include\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WXINTL_NO_GETTEXT_MACRO;WXUSINGDLL;wxMSVC_VERSION_AUTO;wxMSVC_VERSION_ABI_COMPAT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>

tools/msvc/properties/zlib.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DarkRadiantRoot)\w32deps\libzlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinDepsDir)libzlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libzlib$(LibSuffix)-vc$(PlatformToolsetVersion).lib;%(AdditionalDependencies)</AdditionalDependencies>

tools/msvc/vcs.vcxproj

@@ -64,6 +64,7 @@
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
     <Import Project="properties\libxml2.props" />
+    <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -72,6 +73,7 @@
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
     <Import Project="properties\libxml2.props" />
+    <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -80,6 +82,7 @@
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
     <Import Project="properties\libxml2.props" />
+    <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -88,6 +91,7 @@
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
     <Import Project="properties\libxml2.props" />
+    <Import Project="properties\zlib.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">