Restructure swGUI projects

nieznanysprawiciel · Oct 18, 2024 · cb3960d · cb3960d
1 parent 2369e8a
commit cb3960d
Show file tree

Hide file tree

Showing 30 changed files with 231 additions and 226 deletions.
diff --git a/swGUI/ProjectDir/Visual2015/CoreGUI/CoreGUI.vcxproj b/swGUI/ProjectDir/Visual2015/CoreGUI/CoreGUI.vcxproj
@@ -52,27 +52,36 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+
+  <Import Project="..\Paths.props" />
+  <Import Project="..\LibraryConfig.props" />
+  <Import Project="..\LinkReflection.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="CoreGUIConfig.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="CoreGUIConfig.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" />
-    <Import Project="CoreGUIConfig.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="CoreGUIConfig.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>swGUI/Core/stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

diff --git a/swGUI/ProjectDir/Visual2015/LibraryConfig.props b/swGUI/ProjectDir/Visual2015/LibraryConfig.props
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Label="UserMacros">
+    <LibraryName>$(ProjectName)</LibraryName>
+    <LibraryLibDir>$(LibDir)</LibraryLibDir>
+    <LibrarySourceDir>$(SourceDir)$(LibraryName)\</LibrarySourceDir>
+    <LibraryFileName>$(LibraryName)</LibraryFileName>
+    <LibraryIntermediateDir>$(IntermediateDir)$(LibraryName)\</LibraryIntermediateDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SourceInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__UNUSED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>  
+    <Link>
+      <AdditionalLibraryDirectories>$(LibraryLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(LibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <PropertyGroup>
+    <IntDir>$(LibraryIntermediateDir)</IntDir>
+    <TargetName>$(LibraryFileName)</TargetName>
+    <OutDir>$(LibraryLibDir)</OutDir>
+  </PropertyGroup>
+</Project>
diff --git a/swGUI/ProjectDir/Visual2015/LinkReflection.props b/swGUI/ProjectDir/Visual2015/LinkReflection.props
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Label="UserMacros">
+    <SubBuild>$(Configuration)-$(PlatformShortName)-$(PlatformToolset)</SubBuild>
+
+    <ReflectionName>Reflection</ReflectionName>
+    <ReflectionLibDir>$(SourceInclude)swCommonLib\_Target\$(SubBuild)\LibDir\</ReflectionLibDir>
+	  <ReflectionFileName>$(ReflectionName)</ReflectionFileName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_PropertySheetDisplayName>LinkReflection</_PropertySheetDisplayName>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SourceInclude)swCommonLib/Reflection/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+	    <PreprocessorDefinitions>RTTR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+
+    <Link>
+		  <AdditionalLibraryDirectories>$(ReflectionLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+		  <AdditionalDependencies>$(ReflectionFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+
+    <PostBuildEvent>
+      <Command>copy $(ReflectionLibDir)$(ReflectionFileName).dll $(OutDir)$(ReflectionName).dll
+        %(Command)
+      </Command>
+      <Message>Copy Reflection.dll to output directory.</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/swGUI/ProjectDir/Visual2015/MockNativeGUI/MockNativeGUI.vcxproj b/swGUI/ProjectDir/Visual2015/MockNativeGUI/MockNativeGUI.vcxproj
@@ -66,26 +66,27 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+
+  <Import Project="..\Paths.props" />
+  <Import Project="..\LibraryConfig.props" />
+  <Import Project="..\LinkReflection.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="MockNativeGUIConfig.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" />
-    <Import Project="MockNativeGUIConfig.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" />
-    <Import Project="MockNativeGUIConfig.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" />
-    <Import Project="MockNativeGUIConfig.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />

diff --git a/swGUI/ProjectDir/Visual2015/MockNativeGUI/MockNativeGUIConfig.props b/swGUI/ProjectDir/Visual2015/MockNativeGUI/MockNativeGUIConfig.props
diff --git a/swGUI/ProjectDir/Visual2015/Paths.props b/swGUI/ProjectDir/Visual2015/Paths.props
@@ -3,15 +3,23 @@
   <ImportGroup Label="PropertySheets" />
 
   <PropertyGroup Label="UserMacros">
-	<RootDir>$(MSBuildThisFileDirectory)..\..\</RootDir>
-	<ProjectsDir>$(RootDir)ProjectDir\</ProjectsDir>
-	<TestsDir>$(RootDir)Tests\</TestsDir>
-	<ReleaseDir>$(ProjectsDir)Output\</ReleaseDir>
-	<LibDir>$(ReleaseDir)LibDir\</LibDir>
-	<BuildDir>$(ReleaseDir)BuildDir\</BuildDir>
-	<SourceInclude>$(RootDir)..\</SourceInclude>
-	<SourceDir>$(RootDir)</SourceDir>
-	<ExternalDir>$(RootDir)External\</ExternalDir>
+    <SubBuild>$(Configuration)-$(PlatformShortName)-$(PlatformToolset)</SubBuild>
+
+    <RootDir>$(MSBuildThisFileDirectory)..\..\</RootDir>
+    <ProjectsDir>$(RootDir)Projects\</ProjectsDir>
+    <ReleaseDir>$(RootDir)_Target\</ReleaseDir>
+
+    <LibDir>$(ReleaseDir)$(SubBuild)\LibDir\</LibDir>
+    <BuildDir>$(ReleaseDir)$(SubBuild)\BinDir\</BuildDir>
+    <IntermediateDir>$(ReleaseDir)$(SubBuild)\Intermediate\</IntermediateDir>
+    <TestsBinariesDir>$(ReleaseDir)$(SubBuild)\TestsDir\</TestsBinariesDir>
+    <WorkDir>$(ReleaseDir)$(SubBuild)\WorkDir\</WorkDir>
+
+    <SourceInclude>$(RootDir)..\</SourceInclude>
+    <SourceDir>$(RootDir)</SourceDir>
+    <TestsDir>$(RootDir)Tests\</TestsDir>
+    <TestResourcesDir>$(RootDir)TestResources\</TestResourcesDir>
+    <ExternalDir>$(RootDir)External\</ExternalDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -20,9 +28,9 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-	  <LanguageStandard>stdcpp17</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SourceInclude);$(SourceInclude)swCommonLib/Reflection/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-	  <PreprocessorDefinitions>FMT_HEADER_ONLY;RTTR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SourceInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+	    <PreprocessorDefinitions>FMT_HEADER_ONLY;RTTR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 

diff --git a/swGUI/ProjectDir/Visual2015/PrototyperConfig.props b/swGUI/ProjectDir/Visual2015/PrototyperConfig.props
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="LinkSleepingWombatGUI.props" />
+
+  <PropertyGroup Label="UserMacros">
+    <BinaryName>$(ProjectName)</BinaryName>
+    <BinaryDir>$(BuildDir)</BinaryDir>
+    <BinarySourceDir>$(SourceDir)$(BinaryName)\</BinarySourceDir>
+    <BinaryFileName>$(BinaryName)</BinaryFileName>
+    <BinaryIntermediateDir>$(IntermediateDir)$(BinaryName)\</BinaryIntermediateDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SourceInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__UNUSED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>  
+  </ItemDefinitionGroup>
+
+  <PropertyGroup>
+    <IntDir>$(BinaryIntermediateDir)</IntDir>
+    <TargetName>$(BinaryFileName)</TargetName>
+    <OutDir>$(BinaryDir)</OutDir>
+  </PropertyGroup>
+</Project>
diff --git a/swGUI/ProjectDir/Visual2015/Prototypes/PrototyperGUI/PrototyperGUI.vcxproj b/swGUI/ProjectDir/Visual2015/Prototypes/PrototyperGUI/PrototyperGUI.vcxproj
@@ -51,30 +51,26 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\..\Paths.props" />
+  <Import Project="..\..\PrototyperConfig.props" />
+  <Import Project="..\..\LinkReflection.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="PrototyperGUIConfig.props" />
-    <Import Project="..\..\LinkSleepingWombatGUI.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" />
-    <Import Project="PrototyperGUIConfig.props" />
-    <Import Project="..\..\LinkSleepingWombatGUI.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" />
-    <Import Project="PrototyperGUIConfig.props" />
-    <Import Project="..\..\LinkSleepingWombatGUI.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" />
-    <Import Project="PrototyperGUIConfig.props" />
-    <Import Project="..\..\LinkSleepingWombatGUI.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/swGUI/ProjectDir/Visual2015/TestConfig.props b/swGUI/ProjectDir/Visual2015/TestConfig.props
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+
+  <PropertyGroup Label="UserMacros">
+    <TestName>$(ProjectName)</TestName>
+    <TestSourceDir>$(SourceDir)$(TestName)\</TestSourceDir>
+    <TestFileName>$(TestName)</TestFileName>
+    <TestBuildDir>$(TestsBinariesDir)</TestBuildDir>
+    <TestIntermediateDir>$(IntermediateDir)$(TestName)\</TestIntermediateDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntDir>$(TestIntermediateDir)</IntDir>
+    <TargetName>$(TestFileName)</TargetName>
+    <OutDir>$(TestBuildDir)</OutDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <LocalDebuggerWorkingDirectory>$(WorkDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+
+  <Target Name="CreateDirectories" AfterTargets="Build">
+    <MakeDir Directories="$(WorkDir)"/>
+  </Target>
+
+  <ItemDefinitionGroup Condition="Exists('$(TestResourcesDir)')">
+    <PostBuildEvent>
+      <Command>xcopy $(TestResourcesDir) $(WorkDir) /S /Y
+        %(Command)
+      </Command>
+      <Message>Copy TestResources to WorkDir.</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/swGUI/ProjectDir/Visual2015/TestFramework/TestFramework.DX11.vcxproj b/swGUI/ProjectDir/Visual2015/TestFramework/TestFramework.DX11.vcxproj
@@ -72,27 +72,36 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+
+  <Import Project="..\Paths.props" />
+  <Import Project="..\LibraryConfig.props" />
+  <Import Project="..\LinkReflection.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="TestFramework.DX11Config.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" />
-    <Import Project="TestFramework.DX11Config.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" />
-    <Import Project="TestFramework.DX11Config.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" />
-    <Import Project="TestFramework.DX11Config.props" />
   </ImportGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>swGUI/TestFramework/stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/swGUI/ProjectDir/Visual2015/TestFramework/TestFramework.DX11Config.props b/swGUI/ProjectDir/Visual2015/TestFramework/TestFramework.DX11Config.props