From 81291e68928210f80436a7ce2b64aa68e9c83c65 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sat, 11 Mar 2017 11:01:30 -0500 Subject: [PATCH] - fixed: Clang on Linux compile --- src/gl/textures/gl_texture.h | 2 +- src/polyrenderer/poly_all.cpp | 34 ++++++++-------- src/posix/sdl/critsec.cpp | 6 +-- src/swrenderer/r_all.cpp | 76 +++++++++++++++++------------------ src/textures/warpbuffer.h | 1 + 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/src/gl/textures/gl_texture.h b/src/gl/textures/gl_texture.h index 0cafab753..80eede02f 100644 --- a/src/gl/textures/gl_texture.h +++ b/src/gl/textures/gl_texture.h @@ -2,7 +2,7 @@ #define __GL_TEXTURE_H__ #include "r_defs.h" -#include "textures.h" +#include "textures/textures.h" class FBrightmapTexture : public FTexture { diff --git a/src/polyrenderer/poly_all.cpp b/src/polyrenderer/poly_all.cpp index 450454ca1..8968b94ec 100644 --- a/src/polyrenderer/poly_all.cpp +++ b/src/polyrenderer/poly_all.cpp @@ -1,18 +1,18 @@ #include "poly_renderer.cpp" -#include "drawers\poly_buffer.cpp" -#include "drawers\poly_draw_args.cpp" -#include "drawers\poly_triangle.cpp" -#include "drawers\screen_triangle.cpp" -#include "math\poly_intersection.cpp" -#include "math\tri_matrix.cpp" -#include "scene\poly_cull.cpp" -#include "scene\poly_decal.cpp" -#include "scene\poly_particle.cpp" -#include "scene\poly_plane.cpp" -#include "scene\poly_playersprite.cpp" -#include "scene\poly_portal.cpp" -#include "scene\poly_scene.cpp" -#include "scene\poly_sky.cpp" -#include "scene\poly_sprite.cpp" -#include "scene\poly_wall.cpp" -#include "scene\poly_wallsprite.cpp" +#include "drawers/poly_buffer.cpp" +#include "drawers/poly_draw_args.cpp" +#include "drawers/poly_triangle.cpp" +#include "drawers/screen_triangle.cpp" +#include "math/poly_intersection.cpp" +#include "math/tri_matrix.cpp" +#include "scene/poly_cull.cpp" +#include "scene/poly_decal.cpp" +#include "scene/poly_particle.cpp" +#include "scene/poly_plane.cpp" +#include "scene/poly_playersprite.cpp" +#include "scene/poly_portal.cpp" +#include "scene/poly_scene.cpp" +#include "scene/poly_sky.cpp" +#include "scene/poly_sprite.cpp" +#include "scene/poly_wall.cpp" +#include "scene/poly_wallsprite.cpp" diff --git a/src/posix/sdl/critsec.cpp b/src/posix/sdl/critsec.cpp index 56bfef585..b339dabcf 100644 --- a/src/posix/sdl/critsec.cpp +++ b/src/posix/sdl/critsec.cpp @@ -9,15 +9,15 @@ class FInternalCriticalSection { public: - FSDLCriticalSection() + FInternalCriticalSection() { - CritSec = SDL_CreateMutex(); + auto CritSec = SDL_CreateMutex(); if (CritSec == NULL) { I_FatalError("Failed to create a critical section mutex."); } } - ~FSDLCriticalSection() + ~FInternalCriticalSection() { if (CritSec != NULL) { diff --git a/src/swrenderer/r_all.cpp b/src/swrenderer/r_all.cpp index fb2e6a7e4..d2e4e97d4 100644 --- a/src/swrenderer/r_all.cpp +++ b/src/swrenderer/r_all.cpp @@ -2,41 +2,41 @@ #include "r_renderthread.cpp" #include "r_swcanvas.cpp" #include "r_swrenderer.cpp" -#include "drawers\r_draw.cpp" -#include "drawers\r_draw_pal.cpp" -#include "drawers\r_draw_rgba.cpp" -#include "drawers\r_thread.cpp" -#include "line\r_fogboundary.cpp" -#include "line\r_line.cpp" -#include "line\r_renderdrawsegment.cpp" -#include "line\r_walldraw.cpp" -#include "line\r_wallsetup.cpp" -#include "plane\r_flatplane.cpp" -#include "plane\r_planerenderer.cpp" -#include "plane\r_skyplane.cpp" -#include "plane\r_slopeplane.cpp" -#include "plane\r_visibleplane.cpp" -#include "plane\r_visibleplanelist.cpp" -#include "scene\r_3dfloors.cpp" -#include "scene\r_light.cpp" -#include "scene\r_opaque_pass.cpp" -#include "scene\r_portal.cpp" -#include "scene\r_scene.cpp" -#include "scene\r_translucent_pass.cpp" -#include "segments\r_clipsegment.cpp" -#include "segments\r_drawsegment.cpp" -#include "segments\r_portalsegment.cpp" -#include "things\r_decal.cpp" -#include "things\r_particle.cpp" -#include "things\r_playersprite.cpp" -#include "things\r_sprite.cpp" -#include "things\r_visiblesprite.cpp" -#include "things\r_visiblespritelist.cpp" -#include "things\r_voxel.cpp" -#include "things\r_wallsprite.cpp" -#include "viewport\r_drawerargs.cpp" -#include "viewport\r_skydrawer.cpp" -#include "viewport\r_spandrawer.cpp" -#include "viewport\r_spritedrawer.cpp" -#include "viewport\r_viewport.cpp" -#include "viewport\r_walldrawer.cpp" +#include "drawers/r_draw.cpp" +#include "drawers/r_draw_pal.cpp" +#include "drawers/r_draw_rgba.cpp" +#include "drawers/r_thread.cpp" +#include "line/r_fogboundary.cpp" +#include "line/r_line.cpp" +#include "line/r_renderdrawsegment.cpp" +#include "line/r_walldraw.cpp" +#include "line/r_wallsetup.cpp" +#include "plane/r_flatplane.cpp" +#include "plane/r_planerenderer.cpp" +#include "plane/r_skyplane.cpp" +#include "plane/r_slopeplane.cpp" +#include "plane/r_visibleplane.cpp" +#include "plane/r_visibleplanelist.cpp" +#include "scene/r_3dfloors.cpp" +#include "scene/r_light.cpp" +#include "scene/r_opaque_pass.cpp" +#include "scene/r_portal.cpp" +#include "scene/r_scene.cpp" +#include "scene/r_translucent_pass.cpp" +#include "segments/r_clipsegment.cpp" +#include "segments/r_drawsegment.cpp" +#include "segments/r_portalsegment.cpp" +#include "things/r_decal.cpp" +#include "things/r_particle.cpp" +#include "things/r_playersprite.cpp" +#include "things/r_sprite.cpp" +#include "things/r_visiblesprite.cpp" +#include "things/r_visiblespritelist.cpp" +#include "things/r_voxel.cpp" +#include "things/r_wallsprite.cpp" +#include "viewport/r_drawerargs.cpp" +#include "viewport/r_skydrawer.cpp" +#include "viewport/r_spandrawer.cpp" +#include "viewport/r_spritedrawer.cpp" +#include "viewport/r_viewport.cpp" +#include "viewport/r_walldrawer.cpp" diff --git a/src/textures/warpbuffer.h b/src/textures/warpbuffer.h index 2516a838a..673ba0946 100644 --- a/src/textures/warpbuffer.h +++ b/src/textures/warpbuffer.h @@ -1,3 +1,4 @@ +#include "textures/textures.h" template void WarpBuffer(TYPE *Pixels, const TYPE *source, int width, int height, int xmul, int ymul, unsigned time, float Speed, int warptype)