Skip to content

Commit 7c54c5d

Browse files
committed
xrRenderPC_GL: fix case-sensitive includes
1 parent 6f16313 commit 7c54c5d

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

src/Layers/xrRender/light.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#include "xrCDB/ISpatial.h"
55

66
#if (RENDER == R_R2) || (RENDER == R_R3) || (RENDER == R_R4) || (RENDER==R_GL)
7-
#include "light_package.h"
7+
#include "Light_Package.h"
88
#include "light_smapvis.h"
9-
#include "light_GI.h"
9+
#include "light_gi.h"
1010
#endif //(RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
1111

1212
class light : public IRender_Light, public SpatialBase
File renamed without changes.

src/Layers/xrRenderPC_GL/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
project(xrRenderPC_GL)
22

33
list(APPEND DIRS
4-
"."
5-
)
4+
"."
5+
)
66

77

88
add_dir("${DIRS}")
99

1010
include_directories(
11-
${CMAKE_CURRENT_SOURCE_DIR}/../..
12-
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
13-
${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
14-
)
11+
${CMAKE_CURRENT_SOURCE_DIR}/../..
12+
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
13+
${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
14+
${SDL_INCLUDE_DIRS}
15+
)
1516

1617
#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
1718
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")

src/Layers/xrRenderPC_GL/blender_bloom_build.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include "Blender_bloom_build.h"
4+
#include "blender_bloom_build.h"
55

66
CBlender_bloom_build::CBlender_bloom_build() { description.CLS = 0; }
77
CBlender_bloom_build::~CBlender_bloom_build() { }

src/Layers/xrRenderPC_GL/rgl.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include "Layers/xrRender/DetailManager.h"
99
#include "Layers/xrRender/ModelPool.h"
1010
#include "Layers/xrRender/WallmarksEngine.h"
11-
#include "smap_allocator.h"
12-
#include "Layers/xrRender/light_db.h"
13-
#include "Layers/xrRender/light_render_direct.h"
11+
#include "SMAP_Allocator.h"
12+
#include "Layers/xrRender/Light_DB.h"
13+
#include "Layers/xrRender/Light_Render_Direct.h"
1414
#include "Layers/xrRender/LightTrack.h"
1515
#include "Layers/xrRender/r_sun_cascades.h"
1616
#include "xrEngine/IRenderable.h"
@@ -363,8 +363,8 @@ class CRender : public D3DXRenderBase
363363
void ScreenshotAsyncEnd(CMemoryWriter& memory_writer) override;
364364
void OnFrame() override;
365365

366-
void BeforeWorldRender() override; //--#SM+#-- +SecondVP+ Вызывается перед началом рендера мира и пост-эффектов
367-
void AfterWorldRender() override; //--#SM+#-- +SecondVP+ Вызывается после рендера мира и перед UI
366+
void BeforeWorldRender() override; //--#SM+#-- +SecondVP+ Procedure is called before world render and post-effects
367+
void AfterWorldRender() override; //--#SM+#-- +SecondVP+ Procedure is called after world render and before UI
368368

369369
// Render mode
370370
void rmNear() override;

src/Layers/xrRenderPC_GL/stdafx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#include <GL/glu.h>
1515
#include "SDL_opengl_glext.h"
1616

17+
#if defined(WINDOWS)
1718
#include "Layers/xrRender/xrD3DDefs.h"
19+
#endif
1820
#include "Layers/xrRender/Debug/dxPixEventWrapper.h"
1921

2022
#define R_GL 0

0 commit comments

Comments
 (0)