*** empty log message ***

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