From 5e6eb006b94a387300650302bfce14190e51dafa Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 30 Oct 2011 16:07:26 -0700 Subject: [PATCH] Fix some Linux issues in plGImage. --- Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp | 6 +++--- Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp index 7452642e..299535b3 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp +++ b/Sources/Plasma/PubUtilLib/plGImage/plAVIWriter.cpp @@ -101,7 +101,7 @@ public: virtual bool Open(const char* fileName, plPipeline* pipeline); virtual void Close(); -} +}; #endif plAVIWriter::~plAVIWriter() @@ -172,9 +172,9 @@ hsBool plAVIWriterImp::MsgReceive(plMessage* msg) static const int kFramesPerSec = 30; -#if HS_BUILD_FOR_WIN32 bool plAVIWriterImp::Open(const char* fileName, plPipeline* pipeline) { +#if HS_BUILD_FOR_WIN32 // Already writing, fail if (fStreamHandle) return false; @@ -250,12 +250,12 @@ bool plAVIWriterImp::Open(const char* fileName, plPipeline* pipeline) Close(); return false; } +#endif plgDispatch::Dispatch()->RegisterForExactType(plRenderMsg::Index(), GetKey()); return true; } -#endif void plAVIWriterImp::Close() { diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h index 522b7277..27cba099 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.h @@ -43,7 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef hsGDDrawDllLoad_inc #define hsGDDrawDllLoad_inc +#include "hsConfig.h" +#if HS_BUILD_FOR_WIN32 class hsGDDrawDllLoad { private: @@ -55,5 +57,6 @@ public: static HMODULE GetD3DDll(); }; +#endif #endif // hsGDDrawDllLoad_inc