Skip to content

Commit 9d4fba4

Browse files
Xottab-DUTYXottab-DUTY
committed
Work on editors a bit
1 parent df25fe9 commit 9d4fba4

File tree

8 files changed

+107
-253
lines changed

8 files changed

+107
-253
lines changed

‎src/editors/ECore/ECore.vcxproj‎

Lines changed: 19 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<Configuration>Debug</Configuration>
1010
<Platform>x64</Platform>
1111
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Mixed|Win32">
13+
<Configuration>Mixed</Configuration>
14+
<Platform>Win32</Platform>
15+
</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>
@@ -24,111 +32,25 @@
2432
<RootNamespace>ECore</RootNamespace>
2533
</PropertyGroup>
2634
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<PropertyGroup Label="Configuration">
2836
<ConfigurationType>DynamicLibrary</ConfigurationType>
2937
<PlatformToolset>v141</PlatformToolset>
3038
<CharacterSet>MultiByte</CharacterSet>
31-
<WholeProgramOptimization>true</WholeProgramOptimization>
3239
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
34-
<ConfigurationType>DynamicLibrary</ConfigurationType>
35-
<PlatformToolset>v141</PlatformToolset>
36-
<CharacterSet>MultiByte</CharacterSet>
40+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
3741
<WholeProgramOptimization>true</WholeProgramOptimization>
3842
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
40-
<ConfigurationType>DynamicLibrary</ConfigurationType>
41-
<PlatformToolset>v141</PlatformToolset>
42-
<CharacterSet>MultiByte</CharacterSet>
43-
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
45-
<ConfigurationType>DynamicLibrary</ConfigurationType>
46-
<PlatformToolset>v141</PlatformToolset>
47-
<CharacterSet>MultiByte</CharacterSet>
48-
</PropertyGroup>
4943
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5044
<ImportGroup Label="ExtensionSettings">
5145
</ImportGroup>
52-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
53-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54-
<Import Project="$(SolutionDir)Common.props" />
55-
</ImportGroup>
56-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
57-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
58-
<Import Project="$(SolutionDir)Common.props" />
59-
</ImportGroup>
60-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
61-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62-
<Import Project="$(SolutionDir)Common.props" />
63-
</ImportGroup>
64-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
46+
<ImportGroup Label="PropertySheets">
6547
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6648
<Import Project="$(SolutionDir)Common.props" />
6749
</ImportGroup>
6850
<PropertyGroup Label="UserMacros" />
6951
<PropertyGroup>
7052
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
7153
</PropertyGroup>
72-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73-
<OutDir>$(xrBinDir)</OutDir>
74-
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
75-
</PropertyGroup>
76-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
77-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
78-
<OutDir>$(xrBinDir)</OutDir>
79-
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
80-
</PropertyGroup>
81-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
82-
<ClCompile>
83-
<Optimization>Disabled</Optimization>
84-
<MinimalRebuild>true</MinimalRebuild>
85-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
86-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
87-
<WarningLevel>Level3</WarningLevel>
88-
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
89-
</ClCompile>
90-
<Link>
91-
<GenerateDebugInformation>true</GenerateDebugInformation>
92-
<TargetMachine>MachineX86</TargetMachine>
93-
</Link>
94-
</ItemDefinitionGroup>
95-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
96-
<ClCompile>
97-
<Optimization>Disabled</Optimization>
98-
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
99-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
100-
<WarningLevel>Level3</WarningLevel>
101-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
102-
</ClCompile>
103-
<Link>
104-
<GenerateDebugInformation>true</GenerateDebugInformation>
105-
</Link>
106-
</ItemDefinitionGroup>
107-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
108-
<ClCompile>
109-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
110-
<WarningLevel>Level3</WarningLevel>
111-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
112-
</ClCompile>
113-
<Link>
114-
<GenerateDebugInformation>true</GenerateDebugInformation>
115-
<OptimizeReferences>true</OptimizeReferences>
116-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
117-
<TargetMachine>MachineX86</TargetMachine>
118-
</Link>
119-
</ItemDefinitionGroup>
120-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121-
<ClCompile>
122-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
123-
<WarningLevel>Level3</WarningLevel>
124-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
125-
</ClCompile>
126-
<Link>
127-
<GenerateDebugInformation>true</GenerateDebugInformation>
128-
<OptimizeReferences>true</OptimizeReferences>
129-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
130-
</Link>
131-
</ItemDefinitionGroup>
13254
<ItemGroup>
13355
<ClInclude Include="Editor\ArbitraryList.h" />
13456
<ClInclude Include="Editor\ColorPicker.h" />
@@ -263,7 +185,14 @@
263185
<ClCompile Include="Engine\Image.cpp" />
264186
<ClCompile Include="Engine\NVMeshMender.cpp" />
265187
<ClCompile Include="Engine\nv_algebra.cpp" />
266-
<ClCompile Include="stdafx.cpp" />
188+
<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>
195+
</ClCompile>
267196
</ItemGroup>
268197
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
269198
<ImportGroup Label="ExtensionTargets">

‎src/editors/ECore/Editor/SoundManager.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class ECORE_API CSoundManager
1313
void MakeGameSound(ESoundThumbnail* THM, LPCSTR src_name, LPCSTR game_name);
1414
CSoundManager() {}
1515
virtual ~CSoundManager() { ; }
16-
BOOL__stdcall RemoveSound(LPCSTR fname, EItemType type);
17-
void__stdcall RenameSound(LPCSTR p0, LPCSTR p1, EItemType type);
16+
BOOL __stdcall RemoveSound(LPCSTR fname, EItemType type);
17+
void __stdcall RenameSound(LPCSTR p0, LPCSTR p1, EItemType type);
1818

1919
// texture routines
2020
int GetSounds(FS_FileSet& files, BOOL bFolders = FALSE);

‎src/editors/ECore/stdafx.h‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "Common/Common.hpp"
44

5-
#pragma warn - pck
5+
//#pragma warn - pck
66

7-
#define sqrtf(a) sqrt(a)
7+
//#define sqrtf(a) sqrt(a)
88

99
#define smart_cast dynamic_cast
1010

@@ -19,15 +19,17 @@
1919
#define RENDER R_R1
2020

2121
// Std C++ headers
22-
#include <fastmath.h>
22+
//#include <fastmath.h>
23+
//#include "math.h"
2324
#include <io.h>
2425
#include <fcntl.h>
25-
#include <sys\stat.h>
26+
#include <sys/stat.h>
2627
#include <process.h>
27-
#include <utime.h>
28+
#include <sys/utime.h>
2829

2930
// useful macros
3031
// MSC names for functions
32+
/*
3133
#ifdef _eof
3234
#undef _eof
3335
#endif
@@ -53,8 +55,7 @@ __inline float modff(float a, float* b)
5355
*b = x;
5456
return float(y);
5557
}
56-
__inline float expf(float val) { return ::exp(val); }
57-
#include "xrCore/Platform.h"
58+
__inline float expf(float val) { return ::exp(val); }*/
5859

5960
#ifdef _ECOREB
6061
#define ECORE_API XR_EXPORT
@@ -72,9 +73,35 @@ __inline float expf(float val) { return ::exp(val); }
7273

7374
#define clMsg Msg
7475

76+
enum TMsgDlgType
77+
{
78+
mtWarning,
79+
mtError,
80+
mtInformation,
81+
mtConfirmation,
82+
mtCustom
83+
};
84+
enum TMsgDlgBtn
85+
{
86+
mbYes,
87+
mbNo,
88+
mbOK,
89+
mbCancel,
90+
mbAbort,
91+
mbRetry,
92+
mbIgnore,
93+
mbAll,
94+
mbNoToAll,
95+
mbYesToAll,
96+
mbHelp
97+
};
98+
typedef TMsgDlgBtn TMsgDlgButtons[mbHelp];
99+
75100
// core
76101
#include <xrCore/xrCore.h>
77102

103+
#define AnsiString xr_string
104+
78105
#ifdef _EDITOR
79106
class PropValue;
80107
class PropItem;
@@ -86,7 +113,7 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
86113

87114
#include "xrCDB/xrCDB.h"
88115
#include "xrSound/Sound.h"
89-
#include "xrEngine/PSystem.h"
116+
#include "xrParticles/psystem.h"
90117

91118
// DirectX headers
92119
#include <d3d9.h>
@@ -100,12 +127,12 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
100127
#include "xrCore/FMesh.hpp"
101128
#include "Common/_d3d_extensions.h"
102129

103-
#include "D3DX_Wrapper.h"
130+
//#include "D3DX_Wrapper.h"
104131

105132
DEFINE_VECTOR(AnsiString, AStringVec, AStringIt);
106133
DEFINE_VECTOR(AnsiString*, LPAStringVec, LPAStringIt);
107134

108-
#include "xrServerEntities\xrEProps.h"
135+
#include "xrServerEntities/xrEProps.h"
109136
#include "xrCore/Log.h"
110137
#include "Editor/engine.h"
111138
#include "xrEngine/defines.h"

‎src/editors/LevelEditor/LevelEditor.vcxproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,14 @@
417417
<ClCompile Include="PropertiesEObject.cpp" />
418418
<ClCompile Include="ShaderFunction.cpp" />
419419
<ClCompile Include="Splash.cpp" />
420-
<ClCompile Include="stdafx.cpp" />
420+
<ClCompile Include="stdafx.cpp">
421+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
422+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
423+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
424+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
425+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
426+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
427+
</ClCompile>
421428
<ClCompile Include="TopBar.cpp" />
422429
</ItemGroup>
423430
<ItemGroup>

‎src/editors/ParticleEditor/ParticleEditor.vcxproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,14 @@
230230
<ClCompile Include="PSLibraryEditor.cpp" />
231231
<ClCompile Include="Splash.cpp" />
232232
<ClCompile Include="StatGraph.cpp" />
233-
<ClCompile Include="stdafx.cpp" />
233+
<ClCompile Include="stdafx.cpp">
234+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
235+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
236+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
237+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
238+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
239+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
240+
</ClCompile>
234241
<ClCompile Include="TopBar.cpp" />
235242
<ClCompile Include="UI_ParticleMain.cpp" />
236243
<ClCompile Include="UI_ParticleTools.cpp" />

‎src/editors/ShaderEditor/ShaderEditor.vcxproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,14 @@
4545
<ClCompile Include="SHSoundEnvTools.cpp" />
4646
<ClCompile Include="SHToolsInterface.cpp" />
4747
<ClCompile Include="Splash.cpp" />
48-
<ClCompile Include="stdafx.cpp" />
48+
<ClCompile Include="stdafx.cpp">
49+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
50+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
51+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
52+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
53+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
54+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
55+
</ClCompile>
4956
<ClCompile Include="TopBar.cpp" />
5057
<ClCompile Include="ui_shadermain.cpp" />
5158
<ClCompile Include="UI_shadertools.cpp" />

0 commit comments

Comments
 (0)