From 7f39558b23d6cff1a1e41c19b2e043551c38660d Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 20:24:35 -0700 Subject: [PATCH] PubUtilLib -> cmake part II --- .../Plasma20/CMakeLists.txt | 1 + .../Sources/Plasma/PubUtilLib/CMakeLists.txt | 23 ++++++++++ .../PubUtilLib/plCompression/CMakeLists.txt | 1 - .../Plasma/PubUtilLib/plFile/CMakeLists.txt | 41 +++++++++++++++++ .../Plasma/PubUtilLib/plFile/plFileUtils.cpp | 2 +- .../Plasma/PubUtilLib/plGImage/plBitmap.h | 2 +- .../Plasma/PubUtilLib/plGLight/CMakeLists.txt | 37 +++++++++++++++ .../plGLight/plDirectShadowMaster.cpp | 2 +- .../PubUtilLib/plGLight/plGLightCreatable.h | 2 +- .../PubUtilLib/plGLight/plLightInfo.cpp | 46 +++++++++---------- .../Plasma/PubUtilLib/plGLight/plLightInfo.h | 4 +- .../PubUtilLib/plGLight/plLightProxy.cpp | 6 +-- .../Plasma/PubUtilLib/plGLight/plLightProxy.h | 2 +- .../PubUtilLib/plGLight/plLightSpace.cpp | 4 +- .../Plasma/PubUtilLib/plGLight/plLightSpace.h | 2 +- .../plGLight/plPointShadowMaster.cpp | 2 +- .../PubUtilLib/plGLight/plShadowCaster.cpp | 16 +++---- .../PubUtilLib/plGLight/plShadowCaster.h | 2 +- .../PubUtilLib/plGLight/plShadowMaster.cpp | 10 ++-- .../PubUtilLib/plGLight/plShadowMaster.h | 2 +- .../Plasma/PubUtilLib/plInterp/CMakeLists.txt | 31 +++++++++++++ .../Plasma/PubUtilLib/plInterp/hsInterp.cpp | 2 +- .../Plasma/PubUtilLib/plInterp/hsKeys.h | 2 +- .../Plasma/PubUtilLib/plInterp/plAnimPath.h | 4 +- .../PubUtilLib/plInterp/plAnimTimeConvert.cpp | 14 +++--- .../PubUtilLib/plInterp/plAnimTimeConvert.h | 4 +- .../PubUtilLib/plInterp/plController.cpp | 2 +- .../Plasma/PubUtilLib/plInterp/plController.h | 2 +- .../PubUtilLib/plInterp/plInterpCreatable.h | 2 +- .../PubUtilLib/plInterp/plModulator.cpp | 2 +- .../Plasma/PubUtilLib/plInterp/plModulator.h | 2 +- .../PubUtilLib/plIntersect/CMakeLists.txt | 31 +++++++++++++ .../PubUtilLib/plIntersect/plHardRegion.cpp | 2 +- .../plIntersect/plIntersectCreatable.h | 2 +- .../PubUtilLib/plIntersect/plRegionBase.h | 2 +- .../PubUtilLib/plIntersect/plSoftVolume.cpp | 2 +- .../PubUtilLib/plIntersect/plVolumeIsect.cpp | 2 +- .../PubUtilLib/plIntersect/plVolumeIsect.h | 2 +- .../Plasma/PubUtilLib/plJPEG/CMakeLists.txt | 20 ++++++++ .../Plasma/PubUtilLib/plJPEG/plJPEG.cpp | 8 ++-- .../PubUtilLib/plModifier/plSDLModifier.h | 4 +- .../Plasma/PubUtilLib/plSurface/hsGMaterial.h | 2 +- 42 files changed, 267 insertions(+), 84 deletions(-) create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt create mode 100644 MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt diff --git a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt index 1149cdab..f763e040 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt @@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8) # Find all 3rd-party libraries that are required find_package(OpenSSL REQUIRED) find_package(OpenAL REQUIRED) +find_package(ZLIB REQUIRED) option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt new file mode 100644 index 00000000..0f4d2f7a --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -0,0 +1,23 @@ +add_definitions(-D_LIB) + +add_subdirectory(plAgeDescription) +add_subdirectory(plAgeLoader) +add_subdirectory(plAudible) +#add_subdirectory(plAudio) # TODO: DirectX +#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAvatar) +add_subdirectory(plCompression) +add_subdirectory(plContainer) +#add_subdirectory(plDeviceSelector) # Not being used by any current slns +add_subdirectory(plDrawable) +add_subdirectory(plEncryption) +add_subdirectory(plFile) +#add_subdirectory(plGClip) # Not being used by any current slns +#add_subdirectory(plGeometry) # Not being used by any current slns +#add_subdirectory(plGImage) +add_subdirectory(plGLight) +#add_subdirectory(plGRenderProcs) # Not being used by any current slns +#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInterp) +add_subdirectory(plIntersect) +add_subdirectory(plJPEG) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt index 9d3d4e46..f7d6a83d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plCompression/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories("../../CoreLib") -find_package(ZLIB REQUIRED) include_directories(${ZLIB_INCLUDE_DIR}) set(plCompression_SOURCES diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt new file mode 100644 index 00000000..edebf65d --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${ZLIB_INCLUDE_DIR}) + +set(plFile_SOURCES + hsFiles.cpp + plBrowseFolder.cpp + plEncryptedStream.cpp + plFileUtils.cpp + plInitFileReader.cpp + plSecureStream.cpp + plStreamSource.cpp +) + +if(WIN32) + set(plFile_SOURCES ${plFile_SOURCES} hsFiles_Win.cpp) +elseif(APPLE) + set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Mac.cpp") +#elseif(PS2) +# set(plFile_SOURCES "${plFile_SOURCES} hsFiles_PS2.cpp") +else(WIN32) + set(plFile_SOURCES "${plFile_SOURCES} hsFiles_Unix.cpp") +endif(WIN32) + +set(plFile_HEADERS + hsFiles.h + plBrowseFolder.h + plEncryptedStream.h + plFileUtils.h + plInitFileReader.h + plSecureStream.h + plStreamSource.h +) + +add_library(plFile STATIC ${plFile_SOURCES} ${plFile_HEADERS}) +target_link_libraries(plFile ${ZLIB_LIBRARIES}) + +source_group("Source Files" FILES ${plFile_SOURCES}) +source_group("Header Files" FILES ${plFile_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp index 6336af88..b5363e9c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStringTokenizer.h" #include "hsWindows.h" -#include "../plUnifiedTime/plUnifiedTime.h" +#include "plUnifiedTime/plUnifiedTime.h" #include "plSecureStream.h" // for the default key diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h index 17e8971a..aa189e4e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plBitmap.h @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plBitmap_h #define _plBitmap_h -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" class hsResMgr; class plFilterMask; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt new file mode 100644 index 00000000..1c149657 --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/CMakeLists.txt @@ -0,0 +1,37 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plGLight_SOURCES + plDirectShadowMaster.cpp + plLightInfo.cpp + plLightProxy.cpp + plLightSpace.cpp + plPerspDirSlave.cpp + plPointShadowMaster.cpp + plShadowCaster.cpp + plShadowMaster.cpp + plShadowSlave.cpp +) + +set(plGLight_HEADERS + plDirectShadowMaster.h + plGLightCreatable.h + plLightInfo.h + plLightKonstants.h + plLightProxy.h + plLightSpace.h + plPerspDirSlave.h + plPointShadowMaster.h + plShadowCaster.h + plShadowMaster.h + plShadowSlave.h +) + +add_library(plGLight STATIC ${plGLight_SOURCES} ${plGLight_HEADERS}) + +source_group("Source Files" FILES ${plGLight_SOURCES}) +source_group("Header Files" FILES ${plGLight_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp index 0e3d1261..1beb65e2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plShadowSlave.h" #include "plPerspDirSlave.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" #include "plLightInfo.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h index 0a37b58c..363bc4a1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plGLightCreatable_inc #define plGLightCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plLightInfo.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp index a44a3f1d..f6aeaf11 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp @@ -30,40 +30,40 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBounds.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnMessage/plNodeRefMsg.h" +#include "pnMessage/plNodeRefMsg.h" #include "plgDispatch.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../plDrawable/plSpaceTree.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plPipeline/hsGDeviceRef.h" -#include "../plPipeline/plRenderTarget.h" +#include "plIntersect/plVolumeIsect.h" +#include "plDrawable/plSpaceTree.h" +#include "plDrawable/plDrawableGenerator.h" +#include "plDrawable/plDrawableSpans.h" +#include "plPipeline/hsGDeviceRef.h" +#include "plPipeline/plRenderTarget.h" #include "hsFastMath.h" -#include "../pnSceneObject/plDrawInterface.h" -#include "../plSurface/plLayerInterface.h" -#include "../plSurface/plLayer.h" -#include "../plSurface/hsGMaterial.h" -#include "../plGImage/plMipmap.h" -#include "../plMessage/plRenderMsg.h" -#include "../plMessage/plRenderRequestMsg.h" -#include "../plScene/plRenderRequest.h" +#include "pnSceneObject/plDrawInterface.h" +#include "plSurface/plLayerInterface.h" +#include "plSurface/plLayer.h" +#include "plSurface/hsGMaterial.h" +#include "plGImage/plMipmap.h" +#include "plMessage/plRenderMsg.h" +#include "plMessage/plRenderRequestMsg.h" +#include "plScene/plRenderRequest.h" #include "plPipeline.h" -#include "../plIntersect/plSoftVolume.h" -#include "../plPipeline/plPipeDebugFlags.h" -#include "../pnMessage/plPipeResMakeMsg.h" +#include "plIntersect/plSoftVolume.h" +#include "plPipeline/plPipeDebugFlags.h" +#include "pnMessage/plPipeResMakeMsg.h" -#include "../plScene/plVisRegion.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisRegion.h" +#include "plScene/plVisMgr.h" // heinous -#include "../plNetClient/plNetClientMgr.h" -#include "../pnMessage/plEnableMsg.h" +#include "plNetClient/plNetClientMgr.h" +#include "pnMessage/plEnableMsg.h" static hsScalar kMaxYon = 1000.f; static hsScalar kMinHither = 1.f; #include "plLightProxy.h" -#include "../plDrawable/plDrawableGenerator.h" +#include "plDrawable/plDrawableGenerator.h" plLightInfo::plLightInfo() : fSceneNode(nil), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h index 00b3803b..b8ce4463 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h @@ -27,10 +27,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightInfo_inc #define plLightInfo_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" #include "hsMatrix44.h" #include "hsColorRGBA.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" #include "hsBitVector.h" class hsStream; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp index eaffef1e..ebd3a963 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp @@ -27,9 +27,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plLightProxy.h" #include "plLightInfo.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plDrawableGenerator.h" -#include "../pnMessage/plProxyDrawMsg.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableGenerator.h" +#include "pnMessage/plProxyDrawMsg.h" plLightProxy::plLightProxy() : plProxyGen(hsColorRGBA().Set(0,0,0,1.f), hsColorRGBA().Set(0.5f,1.0,0.5f,1.f), 0.2f), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h index 5c391e17..65c25393 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightProxy_inc #define plLightProxy_inc -#include "../plDrawable/plProxyGen.h" +#include "plDrawable/plProxyGen.h" class plLightInfo; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp index b2112a0c..6d471d56 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp @@ -28,8 +28,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLightSpace.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../plMessage/plLightRefMsg.h" -#include "../plMessage/plCollideMsg.h" +#include "plMessage/plLightRefMsg.h" +#include "plMessage/plCollideMsg.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h index 5d9a0289..fb62db3e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class hsStream; class hsResMgr; -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" class plLightSpace : public plMultiModifier { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp index 7dc3565d..171a55d1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPointShadowMaster.h" #include "plShadowSlave.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" #include "plLightInfo.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp index 9015e1c1..3658d297 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp @@ -26,18 +26,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plShadowCaster.h" -#include "../plMessage/plShadowCastMsg.h" +#include "plMessage/plShadowCastMsg.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnSceneObject/plDrawInterface.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plDrawInterface.h" -#include "../plDrawable/plDrawableSpans.h" -#include "../plDrawable/plSpanTypes.h" +#include "plDrawable/plDrawableSpans.h" +#include "plDrawable/plSpanTypes.h" -#include "../plSurface/hsGMaterial.h" -#include "../plSurface/plLayerInterface.h" +#include "plSurface/hsGMaterial.h" +#include "plSurface/plLayerInterface.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h index 06e73a9c..1d46f65e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowCaster_inc #define plShadowCaster_inc -#include "../pnModifier/plMultiModifier.h" +#include "pnModifier/plMultiModifier.h" #include "hsBounds.h" #include "hsTemplates.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp index c55b3f1a..9bfa5177 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp @@ -31,13 +31,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLightInfo.h" #include "plShadowCaster.h" -#include "../plIntersect/plVolumeIsect.h" -#include "../plMessage/plShadowCastMsg.h" -#include "../plMessage/plRenderMsg.h" +#include "plIntersect/plVolumeIsect.h" +#include "plMessage/plShadowCastMsg.h" +#include "plMessage/plRenderMsg.h" -#include "../plDrawable/plDrawableSpans.h" +#include "plDrawable/plDrawableSpans.h" -#include "../plScene/plVisMgr.h" +#include "plScene/plVisMgr.h" #include "hsBounds.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h index 497a2a1e..a7e36c41 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowMaster_inc #define plShadowMaster_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" class plShadowCaster; class plShadowSlave; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt new file mode 100644 index 00000000..b554057b --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plInterp_SOURCES + hsInterp.cpp + hsKeys.cpp + plAnimPath.cpp + plAnimTimeConvert.cpp + plATCEaseCurves.cpp + plController.cpp + plModulator.cpp +) + +set(plInterp_HEADERS + hsInterp.h + hsKeys.h + hsTimedValue.h + plAnimEaseTypes.h + plAnimPath.h + plAnimTimeConvert.h + plController.h + plInterpCreatable.h + plModulator.h +) + +add_library(plInterp STATIC ${plInterp_SOURCES} ${plInterp_HEADERS}) + +source_group("Source Files" FILES ${plInterp_SOURCES}) +source_group("Header Files" FILES ${plInterp_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp index 0f9e0126..6e4d7b28 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "hsTypes.h" #include "hsInterp.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" #include "hsColorRGBA.h" #include "hsPoint2.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h index 632a64d1..31722694 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/hsKeys.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "hsGeometry3.h" #include "hsQuat.h" -#include "../plTransform/hsAffineParts.h" +#include "plTransform/hsAffineParts.h" #include "hsMatrix33.h" #include "hsMatrix44.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h index 06665540..66d92da6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h @@ -30,8 +30,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" -#include "../plTransform/hsAffineParts.h" -#include "../pnFactory/plCreatable.h" +#include "plTransform/hsAffineParts.h" +#include "pnFactory/plCreatable.h" class plCompoundController; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp index 0ed75b9e..7986c52b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp @@ -26,17 +26,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plAnimEaseTypes.h" #include "plAnimTimeConvert.h" -#include "../plAvatar/plAGAnim.h" +#include "plAvatar/plAGAnim.h" #include "hsTimer.h" #include "hsStream.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plMessage/plAnimCmdMsg.h" -#include "../plAvatar/plAGMasterSDLModifier.h" -#include "../plAvatar/plAGMasterMod.h" -#include "../plModifier/plLayerSDLModifier.h" -#include "../plSurface/plLayerAnimation.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plAvatar/plAGMasterSDLModifier.h" +#include "plAvatar/plAGMasterMod.h" +#include "plModifier/plLayerSDLModifier.h" +#include "plSurface/plLayerAnimation.h" #include "hsResMgr.h" #include "plgDispatch.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h index a4ce84c0..25c3affd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h @@ -26,9 +26,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimTimeConvert_inc #define plAnimTimeConvert_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsTemplates.h" -#include "../pnNetCommon/plSynchedValue.h" +#include "pnNetCommon/plSynchedValue.h" #pragma warning (disable: 4284) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.cpp index 7d845796..dfa4b0ba 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.cpp @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsInterp.h" #include "hsResMgr.h" -#include "../plTransform/hsEuler.h" +#include "plTransform/hsEuler.h" #include "plAnimTimeConvert.h" ///////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.h index ed424225..6674e1c2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plController.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define HSCONTROLLER_inc #include "HeadSpin.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "hsColorRGBA.h" #include "hsKeys.h" #include "hsTemplates.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h index 3bad98dc..f3a32672 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterpCreatable_inc #define plInterpCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plController.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp index f101163e..69437881 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp @@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plController.h" -#include "../plIntersect/plVolumeIsect.h" +#include "plIntersect/plVolumeIsect.h" plModulator::plModulator() : fVolume(nil), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.h index cc9eba0f..3c3548a7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInterp/plModulator.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plModulator_inc #define plModulator_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" struct hsMatrix44; struct hsPoint3; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt new file mode 100644 index 00000000..87cebb7a --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plIntersect_SOURCES + plClosest.cpp + plHardRegion.cpp + plHardRegionPlanes.cpp + plHardRegionTypes.cpp + plSoftVolume.cpp + plSoftVolumeTypes.cpp + plVolumeIsect.cpp +) + +set(plIntersect_HEADERS + plClosest.h + plHardRegion.h + plHardRegionPlanes.h + plHardRegionTypes.h + plIntersectCreatable.h + plRegionBase.h + plSoftVolume.h + plSoftVolumeTypes.h + plVolumeIsect.h +) + +add_library(plIntersect STATIC ${plIntersect_SOURCES} ${plIntersect_HEADERS}) + +source_group("Source Files" FILES ${plIntersect_SOURCES}) +source_group("Header Files" FILES ${plIntersect_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp index 1fcef617..5b360e6f 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plHardRegion.h" #include "plgDispatch.h" -#include "../plMessage/plRenderMsg.h" +#include "plMessage/plRenderMsg.h" #include "plPipeline.h" plHardRegion::plHardRegion() diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h index 60589484..d4775957 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plIntersectCreatable_inc #define plIntersectCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plVolumeIsect.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h index b8f27ee0..45e0ce1d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRegionBase_inc #define plRegionBase_inc -#include "../pnSceneObject/plObjInterface.h" +#include "pnSceneObject/plObjInterface.h" struct hsPoint3; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp index e47f693a..af509cbf 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSoftVolume.h" #include "plgDispatch.h" -#include "../plMessage/plListenerMsg.h" +#include "plMessage/plListenerMsg.h" plSoftVolume::plSoftVolume() : fListenState(0), diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp index 1e1a959c..267c504b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp @@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsFastMath.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../plIntersect/plClosest.h" +#include "plIntersect/plClosest.h" static const hsScalar kDefLength = 5.f; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h index 58acb582..c3d6ff3e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h @@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTemplates.h" #include "hsBounds.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class hsBounds3Ext; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt new file mode 100644 index 00000000..281df42e --- /dev/null +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +find_package(JPEG REQUIRED) +include_directories(${JPEG_INCLUDE_DIR}) + +set(plJPEG_SOURCES + plJPEG.cpp +) + +set(plJPEG_HEADERS + plJPEG.h +) + +add_library(plJPEG STATIC ${plJPEG_SOURCES} ${plJPEG_HEADERS}) + +source_group("Source Files" FILES ${plJPEG_SOURCES}) +source_group("Header Files" FILES ${plJPEG_HEADERS}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp index a97d9cc1..b89c09ad 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp @@ -39,17 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsExceptions.h" #include "hsUtils.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" #ifdef IJL_SDK_AVAILABLE #ifndef HS_BUILD_FOR_WIN32 #error Currently the JPEG libraries don't build for anything but Win32. If you're building this on a non-Win32 platform....WHY?? #endif -#include "../../../../../StaticSDKs/Win32/IJL/include/ijl.h" +#include #else -#include "jpeglib.h" -#include "jerror.h" +#include +#include #endif //// Local Statics //////////////////////////////////////////////////////////// diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h index fc4857c1..52c5c415 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSDLModifier_inc #define plSDLModifier_inc -#include "../pnModifier/plSingleModifier.h" -#include "../pnNetCommon/plSDLTypes.h" +#include "pnModifier/plSingleModifier.h" +#include "pnNetCommon/plSDLTypes.h" // // Base class for modifiers which send/recv State Desc Language (SDL) messages diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h index 54f128f8..ed4139a9 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h @@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define hsGCompMatDefined #include "hsTemplates.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plSynchedObject.h" #include "hsGMatState.h" #include "hsColorRGBA.h"