- fixed: Clang on Linux compile

This commit is contained in:
Rachael Alexanderson 2017-03-11 11:01:30 -05:00
parent 72da1fed7e
commit 81291e6892
5 changed files with 60 additions and 59 deletions

View file

@ -2,7 +2,7 @@
#define __GL_TEXTURE_H__
#include "r_defs.h"
#include "textures.h"
#include "textures/textures.h"
class FBrightmapTexture : public FTexture
{

View file

@ -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"

View file

@ -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)
{

View file

@ -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"

View file

@ -1,3 +1,4 @@
#include "textures/textures.h"
template<class TYPE>
void WarpBuffer(TYPE *Pixels, const TYPE *source, int width, int height, int xmul, int ymul, unsigned time, float Speed, int warptype)