Skip to content

Commit b630186

Browse files
gorlakgorlak
committed
Tidy up Platform
1 parent c92f180 commit b630186

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+167
-883
lines changed

‎Editor/App.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "Platform/Exception.h"
77
#include "Platform/Trace.h"
88
#include "Platform/Timer.h"
9-
#include "Platform/Windows/Console.h"
9+
#include "Platform/Console.h"
1010
#include "Platform/Timer.h"
1111

1212
#include "Math/Common.h"

‎Editor/Commands/BuildCommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "Platform/Debug.h"
1111
#include "Platform/Process.h"
12-
#include "Platform/Windows/Console.h"
12+
#include "Platform/Console.h"
1313
#include "Platform/Exception.h"
1414

1515
#include "Foundation/Log.h"

‎Editor/EditorPch.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#pragma once
22

3-
//
4-
// Win32
5-
//
6-
#define _CRT_RAND_S // required for rand_s, must be declared before including stdlib.h
7-
8-
#include "Platform/Windows/Windows.h"
3+
#include "Platform/Platform.h"
94

105
//
116
// Std Library
@@ -57,6 +52,5 @@
5752
#define D3D_DEBUG_INFO
5853
#endif
5954

60-
#undef DrawText
6155
#include <d3d9.h>
6256
#include <d3dx9.h>

‎EditorSupport/FbxSupport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
#include "Math/SimdQuat.h"
1818
#include "GraphicsTypes/VertexTypes.h"
1919

20-
#if HELIUM_CC_MSC
20+
#if HELIUM_CC_CL
2121
#pragma warning( push )
2222
#pragma warning( disable : 4100 ) // 'identifier' : unreferenced formal parameter
2323
#pragma warning( disable : 4512 ) // 'class' : assignment operator could not be generated
2424
#endif
2525

2626
#include <fbxsdk.h>
2727

28-
#if HELIUM_CC_MSC
28+
#if HELIUM_CC_CL
2929
#pragma warning( pop )
3030
#endif
3131

‎EditorSupport/PngImageLoader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ bool PngImageLoader::Load( Image& rImage, Stream* pSourceStream )
175175
}
176176

177177
// Handle longjmp() calls that may be made by libpng later on if an error occurs.
178-
#if HELIUM_CC_MSC
178+
#if HELIUM_CC_CL
179179
// XXX TMC: The only C++ object we create locally is the Image::InitParameters struct, which has a non-trivial
180180
// constructor, but needs only a trivial destructor (no data is cleared or memory freed on destruction). Either way, we
181181
// declare it at the top of the function just to be safe.
@@ -190,7 +190,7 @@ bool PngImageLoader::Load( Image& rImage, Stream* pSourceStream )
190190

191191
return false;
192192
}
193-
#if HELIUM_CC_MSC
193+
#if HELIUM_CC_CL
194194
#pragma warning( pop )
195195
#endif
196196

‎EditorSupport/ShaderVariantResourceHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ bool ShaderVariantResourceHandler::CacheResource(
102102
++pVariantNameString;
103103
int parseResult;
104104
#if HELIUM_UNICODE
105-
#if HELIUM_CC_MSC
105+
#if HELIUM_CC_CL
106106
parseResult = swscanf_s( pVariantNameString, TXT( "%" ) TSCNu32, &userOptionIndex );
107107
#else
108108
parseResult = swscanf( pVariantNameString, TXT( "%" ) TSCNu32, &userOptionIndex );
109109
#endif
110110
#else
111-
#if HELIUM_CC_MSC
111+
#if HELIUM_CC_CL
112112
parseResult = sscanf_s( pVariantNameString, TXT( "%" ) TSCNu32, &userOptionIndex );
113113
#else
114114
parseResult = sscanf( pVariantNameString, TXT( "%" ) TSCNu32, &userOptionIndex );

‎Engine/GameObjectPath.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,13 +780,13 @@ bool GameObjectPath::Parse(
780780
}
781781

782782
#if HELIUM_UNICODE
783-
#if HELIUM_CC_MSC
783+
#if HELIUM_CC_CL
784784
int parseCount = swscanf_s( pTempNameString, TXT( "%" ) TSCNu32, pTargetIndex );
785785
#else
786786
int parseCount = swscanf( pTempNameString, TXT( "%" ) TSCNu32, pTargetIndex );
787787
#endif
788788
#else
789-
#if HELIUM_CC_MSC
789+
#if HELIUM_CC_CL
790790
int parseCount = sscanf_s( pTempNameString, TXT( "%" ) TSCNu32, pTargetIndex );
791791
#else
792792
int parseCount = sscanf( pTempNameString, TXT( "%" ) TSCNu32, pTargetIndex );

‎Foundation/Exception.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
#include "Platform/Assert.h"
55
#include "Platform/String.h"
6-
#include "Platform/Windows/Console.h"
7-
#include "Platform/Windows/MemoryProfiler.h"
8-
#include "Platform/Windows/Windows.h"
6+
#include "Platform/Console.h"
7+
#include "Platform/ProfileMemory.h"
98

109
#include "Foundation/Log.h"
1110

‎Foundation/Exception.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <vector>
55
#include <exception>
66

7+
#include "Platform/Debug.h"
78
#include "Platform/Exception.h"
8-
#include "Platform/Windows/Debug.h"
99

1010
#include "Foundation/API.h"
1111
#include "Foundation/Automation/Event.h"

‎Foundation/ExceptionReport.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
#include "Platform/Process.h"
55
#include "Platform/Exception.h"
66
#include "Platform/Environment.h"
7-
#include "Platform/Windows/MemoryProfiler.h"
8-
#include "Platform/Windows/Console.h"
9-
#include "Platform/Windows/Windows.h"
7+
#include "Platform/ProfileMemory.h"
8+
#include "Platform/Console.h"
109

1110
#include "Foundation/Log.h"
1211
#include "Foundation/Profile.h"

0 commit comments

Comments
 (0)