fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't included by default anymore. This was SVN commit r1155.
This commit is contained in:
parent
02ec0a7e62
commit
e4f160df27
@ -29,7 +29,7 @@
|
||||
#include "Sprite.h"
|
||||
#include "Renderer.h"
|
||||
#include "ogl.h"
|
||||
#include "res/tex.h"
|
||||
#include "res/ogl_tex.h"
|
||||
|
||||
CSprite::CSprite() :
|
||||
m_texture(NULL)
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "res/tex.h"
|
||||
#include "res/ogl_tex.h"
|
||||
#include "res/mem.h"
|
||||
|
||||
#include <string.h>
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "precompiled.h"
|
||||
#include "ogl.h"
|
||||
#include "res/tex.h"
|
||||
#include "res/ogl_tex.h"
|
||||
#include "TextureEntry.h"
|
||||
#include "TextureManager.h"
|
||||
#include "Texture.h"
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include "TextureManager.h"
|
||||
#include "lib.h"
|
||||
#include "ogl.h"
|
||||
#include "res/tex.h"
|
||||
#include "res/ogl_tex.h"
|
||||
#include "CLogger.h"
|
||||
|
||||
#define LOG_CATEGORY "graphics"
|
||||
|
@ -9,9 +9,8 @@
|
||||
#include "lib/sysdep/win/win_internal.h"
|
||||
#endif
|
||||
|
||||
#include "lib/res/tex.h"
|
||||
#include "lib/res/res.h"
|
||||
#include "lib/res/ogl_tex.h"
|
||||
#include "lib/res/vfs.h"
|
||||
#include "lib/ogl.h"
|
||||
#include "CVFSFile.h"
|
||||
|
||||
|
@ -1,9 +1,6 @@
|
||||
#include "res/h_mgr.h"
|
||||
#include "res/vfs.h"
|
||||
#include "res/tex.h"
|
||||
#include "res/ogl_tex.h"
|
||||
#include "res/mem.h"
|
||||
#include "res/unifont.h"
|
||||
|
||||
|
||||
extern int res_reload(const char* fn);
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: unifont.cpp,v 1.17 2004/09/06 03:21:56 gee Exp $
|
||||
$Id: unifont.cpp,v 1.18 2004/09/19 11:55:15 janwas Exp $
|
||||
|
||||
Unicode OpenGL texture font
|
||||
|
||||
@ -12,6 +12,7 @@ Unicode OpenGL texture font
|
||||
#include "lib.h"
|
||||
#include "res.h"
|
||||
#include "ogl.h"
|
||||
#include "ogl_tex.h"
|
||||
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
@ -274,4 +275,4 @@ int unifont_stringsize(const Handle h, const wchar_t* text, int& width, int& hei
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user