From 04d88377ad345e562111e4fc0c227593065ce12c Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 21 Jul 2013 00:50:00 -0700 Subject: [PATCH] Move all the DirectX-specific stuff into a folder. This actually allows us to compile plPipeline on *nix (although linking will fail). --- .../PubUtilLib/plPipeline/CMakeLists.txt | 56 ++++++++++--------- .../plPipeline/{ => DX}/plDXBufferRefs.h | 0 .../plPipeline/{ => DX}/plDXDeviceRef.h | 2 +- .../plPipeline/{ => DX}/plDXDeviceRefs.cpp | 10 ++-- .../plPipeline/{ => DX}/plDXEnumerate.cpp | 4 +- .../plPipeline/{ => DX}/plDXEnumerate.h | 0 .../plPipeline/{ => DX}/plDXLightRef.h | 0 .../plPipeline/{ => DX}/plDXPipeline.cpp | 28 +++++----- .../plPipeline/{ => DX}/plDXPipeline.h | 8 +-- .../plPipeline/{ => DX}/plDXPixelShader.cpp | 0 .../plPipeline/{ => DX}/plDXPixelShader.h | 0 .../plPipeline/{ => DX}/plDXRenderTargetRef.h | 0 .../plPipeline/{ => DX}/plDXSettings.h | 10 ++-- .../plPipeline/{ => DX}/plDXShader.cpp | 0 .../plPipeline/{ => DX}/plDXShader.h | 0 .../plPipeline/{ => DX}/plDXTextFont.cpp | 2 +- .../plPipeline/{ => DX}/plDXTextFont.h | 2 +- .../plPipeline/{ => DX}/plDXTextureRef.h | 0 .../plPipeline/{ => DX}/plDXVertexShader.cpp | 2 +- .../plPipeline/{ => DX}/plDXVertexShader.h | 0 .../PubUtilLib/plPipeline/hsGDDrawDllLoad.cpp | 6 +- .../plPipeline/plPipelineCreatable.h | 2 +- .../PubUtilLib/plPipeline/plTextFont.cpp | 4 ++ .../PubUtilLib/plPipeline/plTextGenerator.cpp | 4 ++ 24 files changed, 79 insertions(+), 61 deletions(-) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXBufferRefs.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXDeviceRef.h (98%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXDeviceRefs.cpp (98%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXEnumerate.cpp (99%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXEnumerate.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXLightRef.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXPipeline.cpp (99%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXPipeline.h (99%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXPixelShader.cpp (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXPixelShader.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXRenderTargetRef.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXSettings.h (98%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXShader.cpp (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXShader.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXTextFont.cpp (99%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXTextFont.h (98%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXTextureRef.h (100%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXVertexShader.cpp (99%) rename Sources/Plasma/PubUtilLib/plPipeline/{ => DX}/plDXVertexShader.h (100%) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt index 2c0bbde7..94f95e48 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -20,12 +20,6 @@ set(plPipeline_SOURCES plCullTree.cpp plDebugText.cpp plDTProgressMgr.cpp - plDXEnumerate.cpp - plDXPipeline.cpp - plDXPixelShader.cpp - plDXShader.cpp - plDXTextFont.cpp - plDXVertexShader.cpp plDynamicEnvMap.cpp plFogEnvironment.cpp plGBufferGroup.cpp @@ -38,11 +32,22 @@ set(plPipeline_SOURCES plVertCoder.cpp ) +set(plDXPipeline_SOURCES + DX/plDXDeviceRefs.cpp + DX/plDXEnumerate.cpp + DX/plDXPipeline.cpp + DX/plDXPixelShader.cpp + DX/plDXShader.cpp + DX/plDXTextFont.cpp + DX/plDXVertexShader.cpp +) + set(plPipeline_HEADERS hsFogControl.h hsG3DDeviceSelector.h hsGColorizer.h hsGDDrawDllLoad.h + hsGDeviceRef.h hsWinRef.h plBinkPlayer.h plCaptureRender.h @@ -53,13 +58,6 @@ set(plPipeline_HEADERS plDebugText.h plDrawPrim.h plDTProgressMgr.h - plDXEnumerate.h - plDXPipeline.h - plDXPixelShader.h - plDXSettings.h - plDXShader.h - plDXTextFont.h - plDXVertexShader.h plDynamicEnvMap.h plFogEnvironment.h plGBufferGroup.h @@ -76,18 +74,26 @@ set(plPipeline_HEADERS plVertCoder.h ) -set(plPipeline_DEVICEREFS - hsGDeviceRef.h - plDXBufferRefs.h - plDXDeviceRef.h - plDXDeviceRefs.cpp - plDXLightRef.h - plDXRenderTargetRef.h - plDXTextureRef.h +set(plDXPipeline_HEADERS + DX/plDXBufferRefs.h + DX/plDXDeviceRef.h + DX/plDXEnumerate.h + DX/plDXLightRef.h + DX/plDXPipeline.h + DX/plDXPixelShader.h + DX/plDXRenderTargetRef.h + DX/plDXSettings.h + DX/plDXShader.h + DX/plDXTextFont.h + DX/plDXTextureRef.h + DX/plDXVertexShader.h ) -add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPipeline_DEVICEREFS}) +if(WIN32) + add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plDXPipeline_SOURCES} ${plPipeline_HEADERS} ${plDXPipeline_HEADERS}) +else() + add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS}) +endif() -source_group("Source Files" FILES ${plPipeline_SOURCES}) -source_group("Header Files" FILES ${plPipeline_HEADERS}) -source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS}) +source_group("Source Files" FILES ${plPipeline_SOURCES} ${plDXPipeline_SOURCES}) +source_group("Header Files" FILES ${plPipeline_HEADERS} ${plDXPipeline_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXBufferRefs.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXBufferRefs.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXBufferRefs.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXBufferRefs.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRef.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRef.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h index 9e326ca1..8ea05964 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRef.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRef.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plDXDeviceRef_h #include "HeadSpin.h" -#include "hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" //// Definition /////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRefs.cpp similarity index 98% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRefs.cpp index f402ea4c..63b3ab04 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXDeviceRefs.cpp @@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include "hsWinRef.h" +#include "plPipeline/hsWinRef.h" #include "plDXPipeline.h" #include "plDXDeviceRef.h" @@ -64,13 +64,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXLightRef.h" #include "plDXTextureRef.h" #include "plDXRenderTargetRef.h" -#include "plGBufferGroup.h" +#include "plPipeline/plGBufferGroup.h" #include "plDrawable/plGeometrySpan.h" #include "plDrawable/plDrawableSpans.h" #include "plGLight/plLightInfo.h" -#include "plRenderTarget.h" -#include "plCubicRenderTarget.h" -#include "plDynamicEnvMap.h" +#include "plPipeline/plRenderTarget.h" +#include "plPipeline/plCubicRenderTarget.h" +#include "plPipeline/plDynamicEnvMap.h" #include "plProfile.h" #include "plStatusLog/plStatusLog.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXEnumerate.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXEnumerate.cpp index 4e1fb102..3cb8d9a6 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXEnumerate.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plDXEnumerate.h" #include -#include "hsGDDrawDllLoad.h" -#include "hsG3DDeviceSelector.h" +#include "plPipeline/hsGDDrawDllLoad.h" +#include "plPipeline/hsG3DDeviceSelector.h" //// Local Typedefs /////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXEnumerate.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXEnumerate.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXEnumerate.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXLightRef.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXLightRef.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXLightRef.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXLightRef.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp index d3e878ea..9aed343b 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp @@ -70,20 +70,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #endif -#include "hsWinRef.h" +#include "plPipeline/hsWinRef.h" #include "HeadSpin.h" #include "plDXPipeline.h" -#include "plPipelineCreate.h" -#include "plDebugText.h" +#include "plPipeline/plPipelineCreate.h" +#include "plPipeline/plDebugText.h" #include "plDXEnumerate.h" -#include "hsG3DDeviceSelector.h" -#include "hsGDDrawDllLoad.h" +#include "plPipeline/hsG3DDeviceSelector.h" +#include "plPipeline/hsGDDrawDllLoad.h" #include "hsResMgr.h" -#include "plStatusLogDrawer.h" +#include "plPipeline/plStatusLogDrawer.h" #include "plQuality.h" -#include "plPipeDebugFlags.h" +#include "plPipeline/plPipeDebugFlags.h" #include "hsTemplates.h" //#include "hsGEnviron.h" @@ -110,17 +110,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plParticleSystem/plParticleEmitter.h" #include "plParticleSystem/plParticle.h" #include "plAvatar/plAvatarClothing.h" -#include "plDebugText.h" -#include "plFogEnvironment.h" +#include "plPipeline/plDebugText.h" +#include "plPipeline/plFogEnvironment.h" #include "plDXTextFont.h" -#include "plGBufferGroup.h" +#include "plPipeline/plGBufferGroup.h" #include "hsTimer.h" #include "plgDispatch.h" #include "plScene/plRenderRequest.h" #include "plScene/plVisMgr.h" -#include "plRenderTarget.h" -#include "plCubicRenderTarget.h" -#include "plDynamicEnvMap.h" +#include "plPipeline/plRenderTarget.h" +#include "plPipeline/plCubicRenderTarget.h" +#include "plPipeline/plDynamicEnvMap.h" #include "pfCamera/plVirtualCamNeu.h" #include "plDXBufferRefs.h" @@ -158,7 +158,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plKey.h" #endif -#include "plCullTree.h" +#include "plPipeline/plCullTree.h" #include "plTweak.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h similarity index 99% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h index 0edf37dc..58dca47a 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h @@ -47,19 +47,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSurface/plLayerInterface.h" #include "hsMatrix44.h" -#include "plFogEnvironment.h" -#include "hsG3DDeviceSelector.h" +#include "plPipeline/plFogEnvironment.h" +#include "plPipeline/hsG3DDeviceSelector.h" #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsColorRGBA.h" -#include "hsGDeviceRef.h" +#include "plPipeline/hsGDeviceRef.h" #include "hsPoint2.h" class plAccessSpan; class plAuxSpan; class plVertexSpan; -#include "plPlates.h" // Used to define plDXPlateManager +#include "plPipeline/plPlates.h" // Used to define plDXPlateManager //// Defines and Konstants and Other Nifty Stuff ////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXPixelShader.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXRenderTargetRef.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXRenderTargetRef.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXRenderTargetRef.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXRenderTargetRef.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXSettings.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXSettings.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXSettings.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXSettings.h index 685cc4f9..076c97fa 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXSettings.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXSettings.h @@ -54,16 +54,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _plDXSettings_h #include "hsMatrix44.h" -#include "plFogEnvironment.h" +#include "plPipeline/plFogEnvironment.h" #include "hsGeometry3.h" #include "hsTemplates.h" #include "hsColorRGBA.h" #include "hsBitVector.h" -#include "plStencil.h" +#include "plPipeline/plStencil.h" #include "hsPoint2.h" -#include "plCullTree.h" -#include "hsWinRef.h" -#include "plViewTransform.h" +#include "plPipeline/plCullTree.h" +#include "plPipeline/hsWinRef.h" +#include "plPipeline/plViewTransform.h" //// General Settings ///////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXShader.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXShader.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXShader.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.cpp index 19e4feff..b6eb1d82 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.cpp @@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include "hsWinRef.h" +#include "plPipeline/hsWinRef.h" #include "plDXTextFont.h" #include "plDXPipeline.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.h similarity index 98% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.h index c16b5cb3..433a5210 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextFont.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDXTextFont_h #define _plDXTextFont_h -#include "plTextFont.h" +#include "plPipeline/plTextFont.h" //#include "hsGDirect3DTnLDevice.h" diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXTextureRef.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextureRef.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXTextureRef.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXTextureRef.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp similarity index 99% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp index cc02d09c..56de890b 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSurface/plShader.h" -#include "plGBufferGroup.h" +#include "plPipeline/plGBufferGroup.h" #include "plDXPipeline.h" plDXVertexShader::plDXVertexShader(plShader* owner) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plPipeline/plDXVertexShader.h rename to Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.h diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.cpp b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.cpp index cc014d6f..e070a778 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/hsGDDrawDllLoad.cpp @@ -40,6 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#ifdef HS_BUILD_FOR_WIN32 + #include "hsWindows.h" #include @@ -71,4 +73,6 @@ hsGDDrawDllLoad::~hsGDDrawDllLoad() HMODULE hsGDDrawDllLoad::GetD3DDll() { return staticDllLoad.fD3DDll; -} \ No newline at end of file +} + +#endif //HS_BUILD_FOR_WIN32 diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h index 47b53ead..ba2e36ab 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "plDXPipeline.h" +#include "DX/plDXPipeline.h" REGISTER_NONCREATABLE( plDXPipeline ); diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTextFont.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTextFont.cpp index 9eb287f5..743a93c3 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTextFont.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTextFont.cpp @@ -76,6 +76,7 @@ plTextFont::~plTextFont() uint16_t *plTextFont::IInitFontTexture( void ) { +#ifdef HS_BUILD_FOR_WIN32 int nHeight, x, y, c; char myChar[ 2 ] = "x"; uint16_t *tBits; @@ -190,6 +191,9 @@ uint16_t *plTextFont::IInitFontTexture( void ) DeleteObject( hFont ); return data; +#else + return nullptr; +#endif } //// Create /////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp index d84618cd..89bac484 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/plTextGenerator.cpp @@ -203,6 +203,8 @@ uint32_t *plTextGenerator::IAllocateOSSurface( uint16_t width, uint16_t hei SelectObject( fWinAlphaDC, fWinAlphaBitmap ); return (uint32_t *)fWinRGBBits; +#else + return 0; #endif } @@ -448,6 +450,8 @@ uint16_t plTextGenerator::CalcStringWidth( const wchar_t *text, uint16_t *h *height = (uint16_t)size.cy; return (uint16_t)size.cx; +#else + return 0; #endif }