xrRenderPC_GL: fix case-sensitive includes

OpenXRay · Aug 27, 2018 · 7c54c5d · 7c54c5d
1 parent 6f16313
commit 7c54c5d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/src/Layers/xrRender/light.h b/src/Layers/xrRender/light.h
@@ -4,9 +4,9 @@
 #include "xrCDB/ISpatial.h"
 
 #if (RENDER == R_R2) || (RENDER == R_R3) || (RENDER == R_R4) || (RENDER==R_GL)
-#include "light_package.h"
+#include "Light_Package.h"
 #include "light_smapvis.h"
-#include "light_GI.h"
+#include "light_gi.h"
 #endif //(RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
 
 class light : public IRender_Light, public SpatialBase

diff --git a/src/Layers/xrRender/light_GI.cpp → src/Layers/xrRender/light_gi.cpp b/src/Layers/xrRender/light_GI.cpp → src/Layers/xrRender/light_gi.cpp
diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt
@@ -1,17 +1,18 @@
 project(xrRenderPC_GL)
 
 list(APPEND DIRS
-	"."
-	)
+    "."
+    )
 
 
 add_dir("${DIRS}")
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../..
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
-	)
+    ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+    ${SDL_INCLUDE_DIRS}
+    )
 
 #list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")

diff --git a/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp b/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "Blender_bloom_build.h"
+#include "blender_bloom_build.h"
 
 CBlender_bloom_build::CBlender_bloom_build() { description.CLS = 0; }
 CBlender_bloom_build::~CBlender_bloom_build() { }

diff --git a/src/Layers/xrRenderPC_GL/rgl.h b/src/Layers/xrRenderPC_GL/rgl.h
@@ -8,9 +8,9 @@
 #include "Layers/xrRender/DetailManager.h"
 #include "Layers/xrRender/ModelPool.h"
 #include "Layers/xrRender/WallmarksEngine.h"
-#include "smap_allocator.h"
-#include "Layers/xrRender/light_db.h"
-#include "Layers/xrRender/light_render_direct.h"
+#include "SMAP_Allocator.h"
+#include "Layers/xrRender/Light_DB.h"
+#include "Layers/xrRender/Light_Render_Direct.h"
 #include "Layers/xrRender/LightTrack.h"
 #include "Layers/xrRender/r_sun_cascades.h"
 #include "xrEngine/IRenderable.h"
@@ -363,8 +363,8 @@ class CRender : public D3DXRenderBase
     void ScreenshotAsyncEnd(CMemoryWriter& memory_writer) override;
     void OnFrame() override;
 
-    void BeforeWorldRender() override; //--#SM+#-- +SecondVP+ Вызывается перед началом рендера мира и пост-эффектов
-    void AfterWorldRender() override;  //--#SM+#-- +SecondVP+ Вызывается после рендера мира и перед UI
+    void BeforeWorldRender() override; //--#SM+#-- +SecondVP+ Procedure is called before world render and post-effects
+    void AfterWorldRender() override;  //--#SM+#-- +SecondVP+ Procedure is called after world render and before UI
 
     // Render mode
     void rmNear() override;

diff --git a/src/Layers/xrRenderPC_GL/stdafx.h b/src/Layers/xrRenderPC_GL/stdafx.h
@@ -14,7 +14,9 @@
 #include <GL/glu.h>
 #include "SDL_opengl_glext.h"
 
+#if defined(WINDOWS)
 #include "Layers/xrRender/xrD3DDefs.h"
+#endif
 #include "Layers/xrRender/Debug/dxPixEventWrapper.h"
 
 #define R_GL 0