*** empty log message ***
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
#pragma comment(lib, "winmm.lib")
|
||||
|
||||
// Link with the DirectShow base class libraries
|
||||
@@ -21,6 +21,13 @@
|
||||
#pragma comment(lib, "baseclasses/release/strmbase.lib")
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* Fix HRESULT under Linux and other non-windows OSses*/
|
||||
#if !defined(HRESULT)
|
||||
typedef long HRESULT
|
||||
#endif
|
||||
|
||||
#include "RageMovieTextureHelper.h"
|
||||
|
||||
#include "RageMovieTexture.h"
|
||||
|
||||
@@ -14,6 +14,11 @@
|
||||
/* Don't know why we need this for the headers ... */
|
||||
typedef char TCHAR, *PTCHAR;
|
||||
|
||||
/* Fix HRESULT under Linux and other non-windows OSses*/
|
||||
#if !defined(HRESULT)
|
||||
typedef long HRESULT
|
||||
#endif
|
||||
|
||||
/* Prevent these from using Dbg stuff, which we don't link in. */
|
||||
#ifdef DEBUG
|
||||
#undef DEBUG
|
||||
|
||||
@@ -88,10 +88,14 @@ RageTexture* RageTextureManager::LoadTexture( RageTextureID ID )
|
||||
splitpath( ID.filename, sDir, sFName, sExt );
|
||||
|
||||
RageTexture* pTexture;
|
||||
#ifndef LINUX
|
||||
if( sExt == ".avi" || sExt == ".mpg" || sExt == ".mpeg" )
|
||||
pTexture = new RageMovieTexture( ID );
|
||||
else
|
||||
pTexture = new RageBitmapTexture( ID );
|
||||
#else
|
||||
pTexture = new RageBitmapTexture(ID);
|
||||
#endif
|
||||
|
||||
// LOG->Trace( "RageTextureManager: Loaded '%s'.", ID.filename.GetString() );
|
||||
|
||||
|
||||
@@ -123,6 +123,12 @@ inline const T& min(const T &a, const T &b, P Pr)
|
||||
#define strnicmp strncasecmp
|
||||
#endif
|
||||
|
||||
|
||||
/* Fix HRESULT probs on Linux */
|
||||
#ifdef LINUX
|
||||
typedef long HRESULT
|
||||
#endif
|
||||
|
||||
/* Don't include our own headers here, since they tend to change
|
||||
* often. */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user