From 4abb3cdbbb7deb4c5359fac630b3d17385c7b396 Mon Sep 17 00:00:00 2001
From: Tim Hentenaar <matriarktervel@users.sourceforge.net>
Date: Wed, 19 Feb 2003 18:13:06 +0000
Subject: [PATCH] *** empty log message ***

---
 stepmania/src/RageMovieTexture.cpp   | 9 ++++++++-
 stepmania/src/RageMovieTexture.h     | 5 +++++
 stepmania/src/RageTextureManager.cpp | 4 ++++
 stepmania/src/global.h               | 6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/RageMovieTexture.cpp b/stepmania/src/RageMovieTexture.cpp
index ab5f147b12..ef676bdb23 100644
--- a/stepmania/src/RageMovieTexture.cpp
+++ b/stepmania/src/RageMovieTexture.cpp
@@ -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"
diff --git a/stepmania/src/RageMovieTexture.h b/stepmania/src/RageMovieTexture.h
index 3bddd30c6b..25b648ecd3 100644
--- a/stepmania/src/RageMovieTexture.h
+++ b/stepmania/src/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
diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp
index 7404873a58..109e62282f 100644
--- a/stepmania/src/RageTextureManager.cpp
+++ b/stepmania/src/RageTextureManager.cpp
@@ -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() );
 
diff --git a/stepmania/src/global.h b/stepmania/src/global.h
index 73176c31b5..7721ed6def 100644
--- a/stepmania/src/global.h
+++ b/stepmania/src/global.h
@@ -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. */