diff --git a/tools/DependencyCheck/DependencyCheck.vcxproj b/tools/DependencyCheck/DependencyCheck.vcxproj index a556e5a15f..2c88d1cbd4 100644 --- a/tools/DependencyCheck/DependencyCheck.vcxproj +++ b/tools/DependencyCheck/DependencyCheck.vcxproj @@ -66,15 +66,19 @@ true + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ true + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ false + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj index 76e95a6259..e38bee7a92 100644 --- a/tools/msvc/DarkRadiant.vcxproj +++ b/tools/msvc/DarkRadiant.vcxproj @@ -91,10 +91,6 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)\..\..\install\ - $(SolutionDir)\..\..\install\ - $(SolutionDir)\..\..\install\ - $(SolutionDir)\..\..\install\ AllRules.ruleset @@ -127,7 +123,7 @@ - $(SolutionDir)/post_build_event.cmd $(Configuration) vc$(PlatformToolsetVersion) + $(DarkRadiantRoot)\tools\msvc\post_build_event.cmd $(Configuration) vc$(PlatformToolsetVersion) @@ -150,7 +146,7 @@ - $(SolutionDir)/post_build_event_x64.cmd $(Configuration) vc$(PlatformToolsetVersion) + $(DarkRadiantRoot)tools\msvc\post_build_event_x64.cmd $(Configuration) vc$(PlatformToolsetVersion) @@ -168,7 +164,7 @@ - $(SolutionDir)/post_build_event.cmd $(Configuration) vc$(PlatformToolsetVersion) + $(DarkRadiantRoot)\tools\msvc\post_build_event.cmd $(Configuration) vc$(PlatformToolsetVersion) @@ -190,7 +186,7 @@ - $(SolutionDir)/post_build_event_x64.cmd $(Configuration) vc$(PlatformToolsetVersion) + $(DarkRadiantRoot)tools\msvc\post_build_event_x64.cmd $(Configuration) vc$(PlatformToolsetVersion) diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj index e711ae6b36..33a9d81a4c 100644 --- a/tools/msvc/DarkRadiantCore.vcxproj +++ b/tools/msvc/DarkRadiantCore.vcxproj @@ -1132,6 +1132,7 @@ + @@ -1143,6 +1144,7 @@ + @@ -1154,6 +1156,7 @@ + @@ -1165,6 +1168,7 @@ + @@ -1174,18 +1178,10 @@ - - $(SolutionDir)\..\..\install\modules\ - - - $(SolutionDir)\..\..\install\modules\ - - - $(SolutionDir)\..\..\install\modules\ - - - $(SolutionDir)\..\..\install\modules\ - + + + + Level3 diff --git a/tools/msvc/Tests/Tests.vcxproj b/tools/msvc/Tests/Tests.vcxproj index 6dfd70b83e..c71db7c6d1 100644 --- a/tools/msvc/Tests/Tests.vcxproj +++ b/tools/msvc/Tests/Tests.vcxproj @@ -55,6 +55,10 @@ + + + + diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj index f92d8496fc..2cccea0b68 100644 --- a/tools/msvc/include.vcxproj +++ b/tools/msvc/include.vcxproj @@ -72,15 +72,19 @@ $(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ diff --git a/tools/msvc/libs.vcxproj b/tools/msvc/libs.vcxproj index 7bfa9d8bea..985dc19f1c 100644 --- a/tools/msvc/libs.vcxproj +++ b/tools/msvc/libs.vcxproj @@ -80,15 +80,19 @@ $(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ $(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)\libsigc++\include;$(IncludePath) + $(DarkRadiantRoot)build\output\$(ProjectName)\$(Platform)\$(Configuration)\ diff --git a/tools/msvc/post_build_event.cmd b/tools/msvc/post_build_event.cmd index 92745a33f6..7e3d718722 100644 --- a/tools/msvc/post_build_event.cmd +++ b/tools/msvc/post_build_event.cmd @@ -1,4 +1,4 @@ -for %%i in (..\..\install\*.dll) do if not "%%~nxi"=="DarkRadiantCore.dll" del "%%i" +for %%i in (..\..\install\*.dll) do del "%%i" del ..\..\install\python*.zip diff --git a/tools/msvc/post_build_event_x64.cmd b/tools/msvc/post_build_event_x64.cmd index c10c38e8ba..2187afb00d 100644 --- a/tools/msvc/post_build_event_x64.cmd +++ b/tools/msvc/post_build_event_x64.cmd @@ -1,4 +1,4 @@ -for %%i in (..\..\install\*.dll) do if not "%%~nxi"=="DarkRadiantCore.dll" del "%%i" +for %%i in (..\..\install\*.dll) do del "%%i" del ..\..\install\python*.zip diff --git a/tools/msvc/properties/DarkRadiant Core Library.props b/tools/msvc/properties/DarkRadiant Core Library.props index 9f1aa9b6b4..0c38f1da98 100644 --- a/tools/msvc/properties/DarkRadiant Core Library.props +++ b/tools/msvc/properties/DarkRadiant Core Library.props @@ -2,9 +2,7 @@ - - $(DarkRadiantRoot)install\ - + advapi32.lib;Dbghelp.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;wsock32.lib;scenelib.lib;mathlib.lib;xmlutillib.lib;modulelib.lib;%(AdditionalDependencies) diff --git a/tools/msvc/properties/DarkRadiant Main Executable.props b/tools/msvc/properties/DarkRadiant Main Executable.props index 6f85a4fbc9..6b81a7997f 100644 --- a/tools/msvc/properties/DarkRadiant Main Executable.props +++ b/tools/msvc/properties/DarkRadiant Main Executable.props @@ -2,7 +2,9 @@ - + + $(DarkRadiantRoot)install\ + $(DarkRadiantRoot)\radiant;%(AdditionalIncludeDirectories) diff --git a/tools/msvc/properties/Tests.props b/tools/msvc/properties/Tests.props index 6afea9f461..1b38046770 100644 --- a/tools/msvc/properties/Tests.props +++ b/tools/msvc/properties/Tests.props @@ -3,7 +3,7 @@ - $(SolutionDir)\..\..\install\ + $(DarkRadiantRoot)install\