Skip to content

Commit 15c2d4c

Browse files
Xottab-DUTYXottab-DUTY
committed
Editors files cleanup
1 parent 1980eba commit 15c2d4c

File tree

9 files changed

+118
-835
lines changed

9 files changed

+118
-835
lines changed

‎src/editors/ActorEditor/ActorEditor.vcxproj

Lines changed: 32 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,35 @@
2626
<Platform>x64</Platform>
2727
</ProjectConfiguration>
2828
</ItemGroup>
29+
<PropertyGroup Label="Globals">
30+
<ProjectGuid>{77BED9F9-EEB1-4ECD-8E4E-E7C673EAAE9C}</ProjectGuid>
31+
<RootNamespace>ActorEditor</RootNamespace>
32+
</PropertyGroup>
33+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
34+
<PropertyGroup Label="Configuration">
35+
<ConfigurationType>Application</ConfigurationType>
36+
<PlatformToolset>v141</PlatformToolset>
37+
<CharacterSet>MultiByte</CharacterSet>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
40+
<WholeProgramOptimization>true</WholeProgramOptimization>
41+
</PropertyGroup>
42+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43+
<ImportGroup Label="ExtensionSettings">
44+
</ImportGroup>
45+
<ImportGroup Label="PropertySheets">
46+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
47+
<Import Project="$(SolutionDir)Common.props" />
48+
</ImportGroup>
49+
<PropertyGroup Label="UserMacros" />
50+
<PropertyGroup>
51+
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
52+
</PropertyGroup>
53+
<ItemDefinitionGroup>
54+
<ClCompile>
55+
<PreprocessorDefinitions>EDITOR;_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
56+
</ClCompile>
57+
</ItemDefinitionGroup>
2958
<ItemGroup>
3059
<ClCompile Include="ActorEditor.cpp" />
3160
<ClCompile Include="BonePart.cpp" />
@@ -35,7 +64,9 @@
3564
<ClCompile Include="LeftBar.cpp" />
3665
<ClCompile Include="main.cpp" />
3766
<ClCompile Include="Splash.cpp" />
38-
<ClCompile Include="stdafx.cpp" />
67+
<ClCompile Include="stdafx.cpp">
68+
<PrecompiledHeader>Create</PrecompiledHeader>
69+
</ClCompile>
3970
<ClCompile Include="TopBar.cpp" />
4071
<ClCompile Include="UI_ActorMain.cpp" />
4172
<ClCompile Include="UI_ActorTools.cpp" />
@@ -63,176 +94,6 @@
6394
<ItemGroup>
6495
<None Include="ActorEditor.todo" />
6596
</ItemGroup>
66-
<PropertyGroup Label="Globals">
67-
<ProjectGuid>{77BED9F9-EEB1-4ECD-8E4E-E7C673EAAE9C}</ProjectGuid>
68-
<RootNamespace>ActorEditor</RootNamespace>
69-
</PropertyGroup>
70-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
71-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
72-
<ConfigurationType>Application</ConfigurationType>
73-
<PlatformToolset>v141</PlatformToolset>
74-
<CharacterSet>MultiByte</CharacterSet>
75-
<WholeProgramOptimization>true</WholeProgramOptimization>
76-
</PropertyGroup>
77-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
78-
<ConfigurationType>Application</ConfigurationType>
79-
<PlatformToolset>v141</PlatformToolset>
80-
<CharacterSet>MultiByte</CharacterSet>
81-
<WholeProgramOptimization>true</WholeProgramOptimization>
82-
</PropertyGroup>
83-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
84-
<ConfigurationType>Application</ConfigurationType>
85-
<PlatformToolset>v141</PlatformToolset>
86-
<CharacterSet>MultiByte</CharacterSet>
87-
<WholeProgramOptimization>true</WholeProgramOptimization>
88-
</PropertyGroup>
89-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
90-
<ConfigurationType>Application</ConfigurationType>
91-
<PlatformToolset>v141</PlatformToolset>
92-
<CharacterSet>MultiByte</CharacterSet>
93-
<WholeProgramOptimization>true</WholeProgramOptimization>
94-
</PropertyGroup>
95-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
96-
<ConfigurationType>Application</ConfigurationType>
97-
<PlatformToolset>v141</PlatformToolset>
98-
<CharacterSet>MultiByte</CharacterSet>
99-
</PropertyGroup>
100-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
101-
<ConfigurationType>Application</ConfigurationType>
102-
<PlatformToolset>v141</PlatformToolset>
103-
<CharacterSet>MultiByte</CharacterSet>
104-
<WholeProgramOptimization>true</WholeProgramOptimization>
105-
</PropertyGroup>
106-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
107-
<ConfigurationType>Application</ConfigurationType>
108-
<PlatformToolset>v141</PlatformToolset>
109-
<CharacterSet>MultiByte</CharacterSet>
110-
</PropertyGroup>
111-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
112-
<ConfigurationType>Application</ConfigurationType>
113-
<PlatformToolset>v141</PlatformToolset>
114-
<CharacterSet>MultiByte</CharacterSet>
115-
</PropertyGroup>
116-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
117-
<ImportGroup Label="ExtensionSettings">
118-
</ImportGroup>
119-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
120-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
121-
<Import Project="$(SolutionDir)Common.props" />
122-
</ImportGroup>
123-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
124-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
125-
<Import Project="$(SolutionDir)Common.props" />
126-
</ImportGroup>
127-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="PropertySheets">
128-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
129-
<Import Project="$(SolutionDir)Common.props" />
130-
</ImportGroup>
131-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="PropertySheets">
132-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
133-
<Import Project="$(SolutionDir)Common.props" />
134-
</ImportGroup>
135-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
136-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
137-
<Import Project="$(SolutionDir)Common.props" />
138-
</ImportGroup>
139-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
140-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
141-
<Import Project="$(SolutionDir)Common.props" />
142-
</ImportGroup>
143-
<PropertyGroup Label="UserMacros" />
144-
<PropertyGroup>
145-
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
146-
</PropertyGroup>
147-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
148-
<OutDir>$(xrBinDir)</OutDir>
149-
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
150-
</PropertyGroup>
151-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
152-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
153-
<OutDir>$(xrBinDir)</OutDir>
154-
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
155-
</PropertyGroup>
156-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
157-
<OutDir>$(xrBinDir)</OutDir>
158-
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
159-
</PropertyGroup>
160-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
161-
<ClCompile>
162-
<Optimization>Disabled</Optimization>
163-
<MinimalRebuild>true</MinimalRebuild>
164-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
165-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
166-
<WarningLevel>Level3</WarningLevel>
167-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
168-
</ClCompile>
169-
<Link>
170-
<GenerateDebugInformation>true</GenerateDebugInformation>
171-
<TargetMachine>MachineX86</TargetMachine>
172-
</Link>
173-
</ItemDefinitionGroup>
174-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
175-
<ClCompile>
176-
<Optimization>Disabled</Optimization>
177-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
178-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
179-
<WarningLevel>Level3</WarningLevel>
180-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
181-
</ClCompile>
182-
<Link>
183-
<GenerateDebugInformation>true</GenerateDebugInformation>
184-
</Link>
185-
</ItemDefinitionGroup>
186-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
187-
<ClCompile>
188-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
189-
<WarningLevel>Level3</WarningLevel>
190-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
191-
</ClCompile>
192-
<Link>
193-
<GenerateDebugInformation>true</GenerateDebugInformation>
194-
<OptimizeReferences>true</OptimizeReferences>
195-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
196-
<TargetMachine>MachineX86</TargetMachine>
197-
</Link>
198-
</ItemDefinitionGroup>
199-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
200-
<ClCompile>
201-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
202-
<WarningLevel>Level3</WarningLevel>
203-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
204-
</ClCompile>
205-
<Link>
206-
<GenerateDebugInformation>true</GenerateDebugInformation>
207-
<OptimizeReferences>true</OptimizeReferences>
208-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
209-
</Link>
210-
</ItemDefinitionGroup>
211-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
212-
<ClCompile>
213-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
214-
<WarningLevel>Level3</WarningLevel>
215-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
216-
</ClCompile>
217-
<Link>
218-
<GenerateDebugInformation>true</GenerateDebugInformation>
219-
<OptimizeReferences>true</OptimizeReferences>
220-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
221-
<TargetMachine>MachineX86</TargetMachine>
222-
</Link>
223-
</ItemDefinitionGroup>
224-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
225-
<ClCompile>
226-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
227-
<WarningLevel>Level3</WarningLevel>
228-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
229-
</ClCompile>
230-
<Link>
231-
<GenerateDebugInformation>true</GenerateDebugInformation>
232-
<OptimizeReferences>true</OptimizeReferences>
233-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
234-
</Link>
235-
</ItemDefinitionGroup>
23697
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
23798
<ImportGroup Label="ExtensionTargets">
23899
</ImportGroup>

‎src/editors/ECore/ECore.vcxproj

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
<PropertyGroup>
5252
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
5353
</PropertyGroup>
54+
<ItemDefinitionGroup>
55+
<ClCompile>
56+
<PreprocessorDefinitions>EDITOR;_EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
57+
</ClCompile>
58+
</ItemDefinitionGroup>
5459
<ItemGroup>
5560
<ClInclude Include="Editor\ArbitraryList.h" />
5661
<ClInclude Include="Editor\ColorPicker.h" />
@@ -168,16 +173,7 @@
168173
<ClCompile Include="Editor\UI_ToolsCustom.cpp" />
169174
<ClCompile Include="Editor\xrLoadSurface.cpp" />
170175
<ClCompile Include="Engine\ai_sounds.cpp" />
171-
<ClCompile Include="Engine\bone.cpp">
172-
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
173-
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
174-
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
175-
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
176-
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
177-
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
178-
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
179-
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
180-
</ClCompile>
176+
<ClCompile Include="Engine\bone.cpp" />
181177
<ClCompile Include="Engine\cl_collector.cpp" />
182178
<ClCompile Include="Engine\GameMtlLib.cpp" />
183179
<ClCompile Include="Engine\GameMtlLib_Engine.cpp" />
@@ -186,12 +182,7 @@
186182
<ClCompile Include="Engine\NVMeshMender.cpp" />
187183
<ClCompile Include="Engine\nv_algebra.cpp" />
188184
<ClCompile Include="stdafx.cpp">
189-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
190-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
191-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
192-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
193-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
194-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
185+
<PrecompiledHeader>Create</PrecompiledHeader>
195186
</ClCompile>
196187
</ItemGroup>
197188
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/editors/LevelEditor/LevelEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR, int)
5252
frmSplash->Repaint();
5353
frmSplash->SetStatus("Core initializing...");
5454

55-
Core._initialize("level", ELogCallback);
55+
Core.Initialize("level", ELogCallback);
5656
CEditableMesh::m_bDraftMeshMode = TRUE;
5757
Application->Initialize();
5858

0 commit comments

Comments
 (0)