PubUtilLib -> cmake part II

(cherry picked from commit 7f39558b23)

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)
 

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)

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

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})

Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp

@@ -57,7 +57,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
 

Sources/Plasma/PubUtilLib/plGImage/plBitmap.h

@@ -55,7 +55,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;

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})

Sources/Plasma/PubUtilLib/plGLight/plDirectShadowMaster.cpp

@@ -46,7 +46,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"
 

Sources/Plasma/PubUtilLib/plGLight/plGLightCreatable.h

@@ -43,7 +43,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"
 

Sources/Plasma/PubUtilLib/plGLight/plLightInfo.cpp

@@ -46,40 +46,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 "plIntersect/plVolumeIsect.h"
-#include "../plDrawable/plSpaceTree.h"
+#include "plDrawable/plSpaceTree.h"
-#include "../plDrawable/plDrawableGenerator.h"
+#include "plDrawable/plDrawableGenerator.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "plDrawable/plDrawableSpans.h"
-#include "../plPipeline/hsGDeviceRef.h"
+#include "plPipeline/hsGDeviceRef.h"
-#include "../plPipeline/plRenderTarget.h"
+#include "plPipeline/plRenderTarget.h"
 #include "hsFastMath.h"
-#include "../pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plDrawInterface.h"
-#include "../plSurface/plLayerInterface.h"
+#include "plSurface/plLayerInterface.h"
-#include "../plSurface/plLayer.h"
+#include "plSurface/plLayer.h"
-#include "../plSurface/hsGMaterial.h"
+#include "plSurface/hsGMaterial.h"
-#include "../plGImage/plMipmap.h"
+#include "plGImage/plMipmap.h"
-#include "../plMessage/plRenderMsg.h"
+#include "plMessage/plRenderMsg.h"
-#include "../plMessage/plRenderRequestMsg.h"
+#include "plMessage/plRenderRequestMsg.h"
-#include "../plScene/plRenderRequest.h"
+#include "plScene/plRenderRequest.h"
 #include "plPipeline.h"
-#include "../plIntersect/plSoftVolume.h"
+#include "plIntersect/plSoftVolume.h"
-#include "../plPipeline/plPipeDebugFlags.h"
+#include "plPipeline/plPipeDebugFlags.h"
-#include "../pnMessage/plPipeResMakeMsg.h"
+#include "pnMessage/plPipeResMakeMsg.h"
 
-#include "../plScene/plVisRegion.h"
+#include "plScene/plVisRegion.h"
-#include "../plScene/plVisMgr.h"
+#include "plScene/plVisMgr.h"
 
 // heinous
-#include "../plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetClientMgr.h"
-#include "../pnMessage/plEnableMsg.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),

Sources/Plasma/PubUtilLib/plGLight/plLightInfo.h

@@ -43,10 +43,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;

Sources/Plasma/PubUtilLib/plGLight/plLightProxy.cpp

@@ -43,9 +43,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/plDrawableSpans.h"
-#include "../plDrawable/plDrawableGenerator.h"
+#include "plDrawable/plDrawableGenerator.h"
-#include "../pnMessage/plProxyDrawMsg.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),

Sources/Plasma/PubUtilLib/plGLight/plLightProxy.h

@@ -43,7 +43,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;
 

Sources/Plasma/PubUtilLib/plGLight/plLightSpace.cpp

@@ -44,8 +44,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/plLightRefMsg.h"
-#include "../plMessage/plCollideMsg.h"
+#include "plMessage/plCollideMsg.h"
 #include "plgDispatch.h"
 
 

Sources/Plasma/PubUtilLib/plGLight/plLightSpace.h

@@ -46,7 +46,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
 {

Sources/Plasma/PubUtilLib/plGLight/plPointShadowMaster.cpp

@@ -45,7 +45,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"
 

Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.cpp

@@ -42,18 +42,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/plSceneObject.h"
-#include "../pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plDrawInterface.h"
 
-#include "../plDrawable/plDrawableSpans.h"
+#include "plDrawable/plDrawableSpans.h"
-#include "../plDrawable/plSpanTypes.h"
+#include "plDrawable/plSpanTypes.h"
 
-#include "../plSurface/hsGMaterial.h"
+#include "plSurface/hsGMaterial.h"
-#include "../plSurface/plLayerInterface.h"
+#include "plSurface/plLayerInterface.h"
 
-#include "../plMessage/plRenderMsg.h"
+#include "plMessage/plRenderMsg.h"
 
 #include "plgDispatch.h"
 

Sources/Plasma/PubUtilLib/plGLight/plShadowCaster.h

@@ -43,7 +43,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"
 

Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp

@@ -47,13 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plLightInfo.h"
 #include "plShadowCaster.h"
 
-#include "../plIntersect/plVolumeIsect.h"
+#include "plIntersect/plVolumeIsect.h"
-#include "../plMessage/plShadowCastMsg.h"
+#include "plMessage/plShadowCastMsg.h"
-#include "../plMessage/plRenderMsg.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"

Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h

@@ -43,7 +43,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;

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})

Sources/Plasma/PubUtilLib/plInterp/hsInterp.cpp

@@ -41,7 +41,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"
 

Sources/Plasma/PubUtilLib/plInterp/hsKeys.h

@@ -45,7 +45,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"
 

Sources/Plasma/PubUtilLib/plInterp/plAnimPath.h

@@ -46,8 +46,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 "plTransform/hsAffineParts.h"
-#include "../pnFactory/plCreatable.h"
+#include "pnFactory/plCreatable.h"
 
 class plCompoundController;
 

Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.cpp

@@ -42,17 +42,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 "pnMessage/plEventCallbackMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
-#include "../plAvatar/plAGMasterSDLModifier.h"
+#include "plAvatar/plAGMasterSDLModifier.h"
-#include "../plAvatar/plAGMasterMod.h"
+#include "plAvatar/plAGMasterMod.h"
-#include "../plModifier/plLayerSDLModifier.h"
+#include "plModifier/plLayerSDLModifier.h"
-#include "../plSurface/plLayerAnimation.h"
+#include "plSurface/plLayerAnimation.h"
 
 #include "hsResMgr.h"
 #include "plgDispatch.h"

Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h

@@ -42,9 +42,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) 
 

Sources/Plasma/PubUtilLib/plInterp/plController.cpp

@@ -43,7 +43,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"
 
 /////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plInterp/plController.h

@@ -43,7 +43,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"

Sources/Plasma/PubUtilLib/plInterp/plInterpCreatable.h

@@ -43,7 +43,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"
 

Sources/Plasma/PubUtilLib/plInterp/plModulator.cpp

@@ -49,7 +49,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),

Sources/Plasma/PubUtilLib/plInterp/plModulator.h

@@ -43,7 +43,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;

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})

Sources/Plasma/PubUtilLib/plIntersect/plHardRegion.cpp

@@ -46,7 +46,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() 

Sources/Plasma/PubUtilLib/plIntersect/plIntersectCreatable.h

@@ -43,7 +43,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"
 

Sources/Plasma/PubUtilLib/plIntersect/plRegionBase.h

@@ -43,7 +43,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;
 

Sources/Plasma/PubUtilLib/plIntersect/plSoftVolume.cpp

@@ -46,7 +46,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),

Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.cpp

@@ -46,7 +46,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;
 

Sources/Plasma/PubUtilLib/plIntersect/plVolumeIsect.h

@@ -48,7 +48,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;
 

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})

Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp

@@ -55,17 +55,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 <ijl.h>
 #else
-#include "jpeglib.h"
+#include <jpeglib.h>
-#include "jerror.h"
+#include <jerror.h>
 #endif
 
 //// Local Statics ////////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.h

@@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plSDLModifier_inc
 #define plSDLModifier_inc
 
-#include "../pnModifier/plSingleModifier.h"
+#include "pnModifier/plSingleModifier.h"
-#include "../pnNetCommon/plSDLTypes.h"
+#include "pnNetCommon/plSDLTypes.h"
 
 //
 // Base class for modifiers which send/recv State Desc Language (SDL) messages

Sources/Plasma/PubUtilLib/plSurface/hsGMaterial.h

@@ -43,7 +43,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"