Skip to content

Commit e438703

Browse files
Xottab-DUTYXottab-DUTY
committed
Fix xrPostprocessEditor compilation
Configure solution and projects
1 parent 278797e commit e438703

File tree

5 files changed

+160
-88
lines changed

5 files changed

+160
-88
lines changed

‎src/editors/xrManagedApi/core/Core.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "Pch.hpp"
22
#include "Core.hpp"
3-
#pragma unmanaged
43
#include "xrCore/xrCore.h"
5-
#pragma managed
64
#include <msclr/marshal_cppstd.h>
75

86
namespace XRay

‎src/editors/xrManagedApi/xrManagedApi.vcxproj

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Mixed|Win32">
913
<Configuration>Mixed</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Mixed|x64">
17+
<Configuration>Mixed</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="Release|Win32">
1321
<Configuration>Release</Configuration>
1422
<Platform>Win32</Platform>
1523
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
1628
</ItemGroup>
1729
<PropertyGroup Label="Globals">
1830
<ProjectGuid>{55B0E2CA-E27A-47FC-BC92-21ABDC1044F5}</ProjectGuid>
@@ -29,45 +41,87 @@
2941
<CLRSupport>true</CLRSupport>
3042
<CharacterSet>Unicode</CharacterSet>
3143
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
45+
<ConfigurationType>DynamicLibrary</ConfigurationType>
46+
<UseDebugLibraries>true</UseDebugLibraries>
47+
<PlatformToolset>v141</PlatformToolset>
48+
<CLRSupport>true</CLRSupport>
49+
<CharacterSet>Unicode</CharacterSet>
50+
</PropertyGroup>
3251
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3352
<ConfigurationType>DynamicLibrary</ConfigurationType>
3453
<UseDebugLibraries>false</UseDebugLibraries>
3554
<PlatformToolset>v141</PlatformToolset>
3655
<CLRSupport>true</CLRSupport>
3756
<CharacterSet>Unicode</CharacterSet>
3857
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
59+
<ConfigurationType>DynamicLibrary</ConfigurationType>
60+
<UseDebugLibraries>false</UseDebugLibraries>
61+
<PlatformToolset>v141</PlatformToolset>
62+
<CLRSupport>true</CLRSupport>
63+
<CharacterSet>Unicode</CharacterSet>
64+
</PropertyGroup>
3965
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
4066
<ConfigurationType>DynamicLibrary</ConfigurationType>
4167
<UseDebugLibraries>false</UseDebugLibraries>
4268
<PlatformToolset>v141</PlatformToolset>
4369
<CLRSupport>true</CLRSupport>
4470
<CharacterSet>Unicode</CharacterSet>
4571
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
73+
<ConfigurationType>DynamicLibrary</ConfigurationType>
74+
<UseDebugLibraries>false</UseDebugLibraries>
75+
<PlatformToolset>v141</PlatformToolset>
76+
<CLRSupport>true</CLRSupport>
77+
<CharacterSet>Unicode</CharacterSet>
78+
</PropertyGroup>
4679
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4780
<ImportGroup Label="ExtensionSettings">
4881
</ImportGroup>
4982
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5083
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5184
<Import Project="$(SolutionDir)Common.props" />
5285
</ImportGroup>
86+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
87+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
88+
<Import Project="$(SolutionDir)Common.props" />
89+
</ImportGroup>
5390
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5491
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5592
<Import Project="$(SolutionDir)Common.props" />
5693
</ImportGroup>
94+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
95+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
96+
<Import Project="$(SolutionDir)Common.props" />
97+
</ImportGroup>
5798
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="PropertySheets">
5899
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
59100
<Import Project="$(SolutionDir)Common.props" />
60101
</ImportGroup>
102+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="PropertySheets">
103+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
104+
<Import Project="$(SolutionDir)Common.props" />
105+
</ImportGroup>
61106
<PropertyGroup Label="UserMacros" />
62107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
63108
<LinkIncremental>true</LinkIncremental>
64109
</PropertyGroup>
110+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
111+
<LinkIncremental>true</LinkIncremental>
112+
</PropertyGroup>
65113
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
66114
<LinkIncremental>false</LinkIncremental>
67115
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117+
<LinkIncremental>false</LinkIncremental>
118+
</PropertyGroup>
68119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
69120
<LinkIncremental>false</LinkIncremental>
70121
</PropertyGroup>
122+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
123+
<LinkIncremental>false</LinkIncremental>
124+
</PropertyGroup>
71125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
72126
<ClCompile>
73127
<WarningLevel>Level3</WarningLevel>
@@ -82,6 +136,20 @@
82136
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
83137
</Link>
84138
</ItemDefinitionGroup>
139+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
140+
<ClCompile>
141+
<WarningLevel>Level3</WarningLevel>
142+
<Optimization>Disabled</Optimization>
143+
<PreprocessorDefinitions>XR_MANAGED_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144+
<PrecompiledHeader>Use</PrecompiledHeader>
145+
<PrecompiledHeaderFile>Pch.hpp</PrecompiledHeaderFile>
146+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
147+
</ClCompile>
148+
<Link>
149+
<GenerateDebugInformation>true</GenerateDebugInformation>
150+
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
151+
</Link>
152+
</ItemDefinitionGroup>
85153
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
86154
<ClCompile>
87155
<WarningLevel>Level3</WarningLevel>
@@ -95,6 +163,19 @@
95163
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
96164
</Link>
97165
</ItemDefinitionGroup>
166+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
167+
<ClCompile>
168+
<WarningLevel>Level3</WarningLevel>
169+
<PreprocessorDefinitions>XR_MANAGED_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170+
<PrecompiledHeader>Use</PrecompiledHeader>
171+
<PrecompiledHeaderFile>Pch.hpp</PrecompiledHeaderFile>
172+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
173+
</ClCompile>
174+
<Link>
175+
<GenerateDebugInformation>true</GenerateDebugInformation>
176+
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
177+
</Link>
178+
</ItemDefinitionGroup>
98179
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
99180
<ClCompile>
100181
<WarningLevel>Level3</WarningLevel>
@@ -108,6 +189,19 @@
108189
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
109190
</Link>
110191
</ItemDefinitionGroup>
192+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
193+
<ClCompile>
194+
<WarningLevel>Level3</WarningLevel>
195+
<PreprocessorDefinitions>XR_MANAGED_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196+
<PrecompiledHeader>Use</PrecompiledHeader>
197+
<PrecompiledHeaderFile>Pch.hpp</PrecompiledHeaderFile>
198+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
199+
</ClCompile>
200+
<Link>
201+
<GenerateDebugInformation>true</GenerateDebugInformation>
202+
<AdditionalDependencies>xrCore.lib;xrGame.lib</AdditionalDependencies>
203+
</Link>
204+
</ItemDefinitionGroup>
111205
<ItemGroup>
112206
<Reference Include="System" />
113207
<Reference Include="System.Data" />
@@ -126,10 +220,18 @@
126220
<ClCompile Include="core\PostProcessAnimator.cpp" />
127221
<ClCompile Include="Pch.cpp">
128222
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
223+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
129224
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
225+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
130226
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
227+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
131228
</ClCompile>
132229
</ItemGroup>
230+
<ItemGroup>
231+
<ProjectReference Include="..\..\xrCore\xrCore.vcxproj">
232+
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
233+
</ProjectReference>
234+
</ItemGroup>
133235
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
134236
<ImportGroup Label="ExtensionTargets">
135237
</ImportGroup>

‎src/editors/xrPostprocessEditor/xrPostprocessEditor.csproj

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectGuid>{CB449DB5-9C97-447A-AA25-35EA7712F62C}</ProjectGuid>
1111
<OutputType>WinExe</OutputType>
12+
<OutputPath>$(xrBinDir)</OutputPath>
13+
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
14+
<PlatformTarget>AnyCPU</PlatformTarget>
15+
<ErrorReport>prompt</ErrorReport>
16+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
1217
<AppDesignerFolder>Properties</AppDesignerFolder>
1318
<RootNamespace>xrPostprocessEditor</RootNamespace>
1419
<AssemblyName>xrPostprocessEditor</AssemblyName>
@@ -19,46 +24,22 @@
1924
<NoWin32Manifest>true</NoWin32Manifest>
2025
</PropertyGroup>
2126
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
22-
<DebugSymbols>true</DebugSymbols>
23-
<OutputPath>$(xrBinDir)</OutputPath>
24-
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
2527
<DefineConstants>DEBUG;TRACE</DefineConstants>
2628
<DebugType>full</DebugType>
27-
<PlatformTarget>x86</PlatformTarget>
28-
<ErrorReport>prompt</ErrorReport>
29-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
32-
<OutputPath>$(xrBinDir)</OutputPath>
33-
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<Optimize>true</Optimize>
36-
<DebugType>pdbonly</DebugType>
37-
<PlatformTarget>x86</PlatformTarget>
38-
<ErrorReport>prompt</ErrorReport>
39-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
40-
</PropertyGroup>
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|Win32'">
42-
<OutputPath>bin\Win32\Mixed\</OutputPath>
43-
<PlatformTarget>AnyCPU</PlatformTarget>
44-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
29+
<DebugSymbols>true</DebugSymbols>
4530
</PropertyGroup>
4631
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|x86'">
47-
<OutputPath>bin\x86\Mixed\</OutputPath>
4832
<DefineConstants>TRACE</DefineConstants>
49-
<Optimize>true</Optimize>
5033
<DebugType>pdbonly</DebugType>
51-
<PlatformTarget>x86</PlatformTarget>
52-
<ErrorReport>prompt</ErrorReport>
53-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
34+
<Optimize>true</Optimize>
5435
</PropertyGroup>
55-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|x64'">
56-
<OutputPath>bin\x64\Mixed\</OutputPath>
57-
<PlatformTarget>AnyCPU</PlatformTarget>
58-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
37+
<Optimize>true</Optimize>
5938
</PropertyGroup>
6039
<ItemGroup>
61-
<Reference Include="Flobbster.Windows.Forms.PropertyGrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
40+
<Reference Include="Flobbster.Windows.Forms.PropertyGrid, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
41+
<HintPath>..\..\..\sdk\binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
42+
</Reference>
6243
<Reference Include="System" />
6344
<Reference Include="System.Core" />
6445
<Reference Include="System.Xml.Linq" />
@@ -69,7 +50,6 @@
6950
<Reference Include="System.Drawing" />
7051
<Reference Include="System.Windows.Forms" />
7152
<Reference Include="System.Xml" />
72-
<Reference Include="xrSdkControls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
7353
</ItemGroup>
7454
<ItemGroup>
7555
<Compile Include="Dialogs\MainDialog.cs">
@@ -119,6 +99,10 @@
11999
<Name>xrManagedApi</Name>
120100
<Private>False</Private>
121101
</ProjectReference>
102+
<ProjectReference Include="..\xrSdkControls\xrSdkControls.csproj">
103+
<Project>{e9dc16a3-d0fa-4924-af6e-f6fdf3ea0661}</Project>
104+
<Name>xrSdkControls</Name>
105+
</ProjectReference>
122106
</ItemGroup>
123107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/editors/xrSdkControls/xrSdkControls.csproj

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,29 @@
99
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1010
<ProjectGuid>{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661}</ProjectGuid>
1111
<OutputType>Library</OutputType>
12+
<OutputPath>$(xrBinDir)</OutputPath>
13+
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
14+
<PlatformTarget>AnyCPU</PlatformTarget>
15+
<ErrorReport>prompt</ErrorReport>
16+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
1217
<AppDesignerFolder>Properties</AppDesignerFolder>
1318
<RootNamespace>XRay.SdkControls</RootNamespace>
1419
<AssemblyName>xrSdkControls</AssemblyName>
1520
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1621
<FileAlignment>512</FileAlignment>
1722
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
19-
<DebugSymbols>true</DebugSymbols>
20-
<OutputPath>$(xrBinDir)</OutputPath>
21-
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
23+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2224
<DefineConstants>DEBUG;TRACE</DefineConstants>
2325
<DebugType>full</DebugType>
24-
<PlatformTarget>x86</PlatformTarget>
25-
<ErrorReport>prompt</ErrorReport>
26-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
26+
<DebugSymbols>true</DebugSymbols>
2727
</PropertyGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
29-
<OutputPath>$(xrBinDir)</OutputPath>
30-
<IntermediateOutputPath>$(xrIntDir)$(AssemblyName)</IntermediateOutputPath>
28+
<PropertyGroup Condition="'$(Configuration)' == 'Mixed'">
3129
<DefineConstants>TRACE</DefineConstants>
32-
<Optimize>true</Optimize>
3330
<DebugType>pdbonly</DebugType>
34-
<PlatformTarget>x86</PlatformTarget>
35-
<ErrorReport>prompt</ErrorReport>
36-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
37-
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|Win32'">
39-
<OutputPath>bin\Win32\Mixed\</OutputPath>
40-
<PlatformTarget>AnyCPU</PlatformTarget>
41-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
42-
</PropertyGroup>
43-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|x86'">
44-
<OutputPath>bin\x86\Mixed\</OutputPath>
45-
<DefineConstants>TRACE</DefineConstants>
4631
<Optimize>true</Optimize>
47-
<DebugType>pdbonly</DebugType>
48-
<PlatformTarget>x86</PlatformTarget>
49-
<ErrorReport>prompt</ErrorReport>
50-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5132
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mixed|x64'">
53-
<OutputPath>bin\x64\Mixed\</OutputPath>
54-
<PlatformTarget>AnyCPU</PlatformTarget>
55-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
56-
</PropertyGroup>
57-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
58-
<OutputPath>..\..\..\bin\Win64\Release\</OutputPath>
33+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
34+
<Optimize>true</Optimize>
5935
</PropertyGroup>
6036
<ItemGroup>
6137
<Reference Include="Flobbster.Windows.Forms.PropertyGrid">

0 commit comments

Comments
 (0)