zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors on linux.

This commit is contained in:
Ralgor 2014-09-14 14:28:05 -05:00
parent 3c2f1952fd
commit ddf58b43c9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl/textures/gl_texture.cpp
View File

@ -814,7 +814,7 @@ CCMD(textureinfo)
if (tex->gl_info.SystemTexture[0] || tex->gl_info.SystemTexture[1] || tex->gl_info.Material[0] || tex->gl_info.Material[1]) if (tex->gl_info.SystemTexture[0] || tex->gl_info.SystemTexture[1] || tex->gl_info.Material[0] || tex->gl_info.Material[1])
{ {
int lump = tex->GetSourceLump(); int lump = tex->GetSourceLump();
Printf(PRINT_LOG, "Texture '%s' (Index %d, Lump %d, Name '%s'):\n", tex->Name, i, lump, Wads.GetLumpFullName(lump)); Printf(PRINT_LOG, "Texture '%s' (Index %d, Lump %d, Name '%s'):\n", (const char*)(tex->Name), i, lump, Wads.GetLumpFullName(lump));
if (tex->gl_info.Material[0]) if (tex->gl_info.Material[0])
{ {
Printf(PRINT_LOG, "in use (normal)\n"); Printf(PRINT_LOG, "in use (normal)\n");

4
src/gl/utility/gl_clock.h
View File

@ -5,12 +5,12 @@
#include "x86.h" #include "x86.h"
#include "m_fixed.h" #include "m_fixed.h"
extern bool gl_benching;
#ifdef _MSC_VER #ifdef _MSC_VER
extern double gl_SecondsPerCycle; extern double gl_SecondsPerCycle;
extern double gl_MillisecPerCycle; extern double gl_MillisecPerCycle;
extern bool gl_benching;
__forceinline long long GetClockCycle () __forceinline long long GetClockCycle ()
{ {