Browse Source

Beginnings of CMake port

(cherry picked from commit 3a51dd0902)
rarified/huru-merge-work/cmake-building
Branan Purvine-Riley 14 years ago committed by rarified
parent
commit
8596c34c50
  1. 26
      CMakeLists.txt
  2. 4
      Sources/Plasma/CMakeLists.txt
  3. 99
      Sources/Plasma/CoreLib/CMakeLists.txt
  4. 16
      Sources/Plasma/CoreLibExe/CMakeLists.txt
  5. 2
      Sources/Plasma/FeatureLib/CMakeLists.txt
  6. 41
      Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt
  7. 2
      Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h
  8. 16
      Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp
  9. 2
      Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h
  10. 16
      Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp
  11. 6
      Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp
  12. 4
      Sources/Plasma/FeatureLib/pfAnimation/plBlower.h
  13. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h
  14. 12
      Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp
  15. 2
      Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h
  16. 4
      Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp
  17. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h
  18. 22
      Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp
  19. 2
      Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h
  20. 6
      Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
  21. 2
      Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h
  22. 6
      Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp
  23. 2
      Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h
  24. 14
      Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp
  25. 2
      Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h
  26. 25
      Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt
  27. 2
      Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h
  28. 30
      Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
  29. 2
      Sources/Plasma/FeatureLib/pfAudio/plListener.h
  30. 16
      Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp
  31. 2
      Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h
  32. 4
      Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h

26
CMakeLists.txt

@ -0,0 +1,26 @@
project(CyanWorldsEngine)
cmake_minimum_required(VERSION 2.8)
# Find all 3rd-party libraries that are required
find_package(OpenSSL REQUIRED)
find_package(OpenAL REQUIRED)
option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
# TODO: are there any other build types which are useful for us?
add_definitions(-DBUILD_TYPE_LIVE)
if(EXTERNAL_RELEASE)
add_definitions(-DPLASMA_EXTERNAL_RELEASE)
endif(EXTERNAL_RELEASE)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_definitions(-D_DEBUG)
endif(CMAKE_BUILD_TYPE STREQUAL Debug)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif(MSVC)
add_subdirectory(Sources/Plasma)
# add_subdirectory(Sources/Tools)

4
Sources/Plasma/CMakeLists.txt

@ -0,0 +1,4 @@
add_subdirectory(CoreLib)
add_subdirectory(CoreLibExe)
add_subdirectory(FeatureLib)
add_subdirectory(NucleusLib)

99
Sources/Plasma/CoreLib/CMakeLists.txt

@ -0,0 +1,99 @@
add_definitions(-D_LIB)
set(CoreLib_SOURCES
HeadSpin.cpp
hsBitVector.cpp
hsBounds.cpp
hsCritSect.cpp
hsExceptionStack.cpp
hsFastMath.cpp
hsGeometry3.cpp
hsMalloc.cpp
hsMatrix33.cpp
hsMatrix44.cpp
hsMemory.cpp
hsMMIOStream.cpp
hsQuat.cpp
hsSafeRefCnt.cpp
hsSTLStream.cpp
hsStlUtils.cpp
hsStream.cpp
hsStringTokenizer.cpp
hsTemplates.cpp
hsThread.cpp
hsUtils.cpp
hsWide.cpp
pcSmallRect.cpp
plGeneric.cpp
plLoadMask.cpp
plViewTransform.cpp
)
if(WIN32 AND NOT CYGWIN)
set(CoreLib_SOURCES ${CoreLib_SOURCES}
hsThread_Win.cpp
)
endif(WIN32 AND NOT CYGWIN)
if(UNIX)
set(CoreLib_SOURCES ${CoreLib_SOURCES}
hsThread_Unix.cpp
)
endif(UNIX)
# for now we use the Unix file on mac... I think this is Carbon code, which
# we don't want to use. I don't think it's worth support OS9 anymore
#if(APPLE)
# set(CoreLib_SOURCES ${CoreLib_SOURCES}
# hsThread_Mac.cpp
# )
#endif(APPLE)
set(CoreLib_HEADERS
HeadSpin.h
hsBiExpander.h
hsBitVector.h
hsBounds.h
hsColorRGBA.h
hsConfig.h
hsCritSect.h
hsExceptions.h
hsFastMath.h
hsFixedTypes.h
hsGeometry3.h
hsHashTable.h
hsMalloc.h
hsMatrix44.h
hsMemory.h
hsMMIOStream.h
hsPoint2.h
hsQuat.h
hsQueue.h
hsRefCnt.h
hsSafeRefCnt.h
hsScalar.h
hsStlSortUtils.h
hsSTLStream.h
hsStream.h
hsStringTokenizer.h
hsTemplates.h
hsTempPointer.h
hsThread.h
hsTypes.h
hsUtils.h
hsWide.h
hsWindowHndl.h
hsWindows.h
pcSmallRect.h
plGeneric.h
plLoadMask.h
plQuality.h
plRefCnt.h
plTweak.h
plViewTransform.h
)
add_library(CoreLib STATIC ${CoreLib_SOURCES} ${CoreLib_HEADERS})
source_group("Source Files" FILES ${CoreLib_SOURCES})
source_group("Header Files" FILES ${CoreLib_HEADERS})

16
Sources/Plasma/CoreLibExe/CMakeLists.txt

@ -0,0 +1,16 @@
add_definitions(-D_LIB)
set(CoreLibExe_SOURCES
hsExeError.cpp
hsExeMalloc.cpp
)
set(CoreLibExe_HEADERS
Intern.h
Pch.h
)
add_library(CoreLibExe STATIC ${CoreLibExe_SOURCES} ${CoreLibExe_HEADERS})
source_group("Source Files" FILES ${CoreLibExe_SOURCES})
source_group("Header Files" FILES ${CoreLibExe_HEADERS})

2
Sources/Plasma/FeatureLib/CMakeLists.txt

@ -0,0 +1,2 @@
add_subdirectory(pfAnimation)
add_subdirectory(pfAudio)

41
Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt

@ -0,0 +1,41 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
include_directories("../../NucleusLib/inc")
include_directories("../../PubUtilLib")
include_directories(${OPENSSL_INCLUDE_DIR})
# this is in the vcproj, but it seems silly for animation...
# find_package(OpenSSL REQUIRED)
set(pfAnimation_SOURCES
pfObjectFlocker.cpp
plAnimDebugList.cpp
plBlower.cpp
plFilterCoordInterface.cpp
plFollowMod.cpp
plLightModifier.cpp
plLineFollowMod.cpp
plRandomCommandMod.cpp
plStereizer.cpp
plViewFaceModifier.cpp
)
set(pfAnimation_HEADERS
pfAnimationCreatable.h
pfObjectFlocker.h
plAnimDebugList.h
plBlower.h
plFilterCoordInterface.h
plFollowMod.h
plLightModifier.h
plLineFollowMod.h
plRandomCommandMod.h
plStereizer.h
plViewFaceModifier.h
)
add_library(pfAnimation STATIC ${pfAnimation_SOURCES} ${pfAnimation_HEADERS})
source_group("Source Files" FILES ${pfAnimation_SOURCES})
source_group("Header Files" FILES ${pfAnimation_HEADERS})

2
Sources/Plasma/FeatureLib/pfAnimation/pfAnimationCreatable.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfAnimationCreatable_inc #ifndef pfAnimationCreatable_inc
#define pfAnimationCreatable_inc #define pfAnimationCreatable_inc
#include "../pnFactory/plCreator.h" #include "pnFactory/plCreator.h"
#include "plViewFaceModifier.h" #include "plViewFaceModifier.h"

16
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp

@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../plMessage/plAgeLoadedMsg.h" #include "plMessage/plAgeLoadedMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plMath/plRandom.h" #include "plMath/plRandom.h"
#include "../pnMessage/plEnableMsg.h" #include "pnMessage/plEnableMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plMessage/plLoadCloneMsg.h" #include "plMessage/plLoadCloneMsg.h"
//#include "../plPipeline/plDebugGeometry.h" //#include "../plPipeline/plDebugGeometry.h"

2
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef OBJECT_FLOCKER_H #ifndef OBJECT_FLOCKER_H
#define OBJECT_FLOCKER_H #define OBJECT_FLOCKER_H
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class hsStream; class hsStream;
class hsResMgr; class hsResMgr;

16
Sources/Plasma/FeatureLib/pfAnimation/plAnimDebugList.cpp

@ -44,14 +44,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "plAnimDebugList.h" #include "plAnimDebugList.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../plSurface/hsGMaterial.h" #include "plSurface/hsGMaterial.h"
#include "../plSurface/plLayerAnimation.h" #include "plSurface/plLayerAnimation.h"
#include "../plAvatar/plAGMasterMod.h" #include "plAvatar/plAGMasterMod.h"
#include "../plAvatar/plAGAnimInstance.h" #include "plAvatar/plAGAnimInstance.h"
#include "../plAvatar/plAGAnim.h" #include "plAvatar/plAGAnim.h"
#include "../plResMgr/plKeyFinder.h" #include "plResMgr/plKeyFinder.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
void plAnimDebugList::AddObjects(char *subString) void plAnimDebugList::AddObjects(char *subString)
{ {

6
Sources/Plasma/FeatureLib/pfAnimation/plBlower.cpp

@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plBlower.h" #include "plBlower.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "hsTimer.h" #include "hsTimer.h"
plRandom plBlower::fRandom; plRandom plBlower::fRandom;

4
Sources/Plasma/FeatureLib/pfAnimation/plBlower.h

@ -43,9 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plBlower_inc #ifndef plBlower_inc
#define plBlower_inc #define plBlower_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "../plMath/plRandom.h" #include "plMath/plRandom.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plSceneObject; class plSceneObject;

2
Sources/Plasma/FeatureLib/pfAnimation/plFilterCoordInterface.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plFilterCoordInterface_inc #ifndef plFilterCoordInterface_inc
#define plFilterCoordInterface_inc #define plFilterCoordInterface_inc
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
class plFilterCoordInterface : public plCoordinateInterface class plFilterCoordInterface : public plCoordinateInterface
{ {

12
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.cpp

@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plFollowMod.h" #include "plFollowMod.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "plPipeline.h" #include "plPipeline.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plFollowMod.h

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plFollowMod_inc #define plFollowMod_inc
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class plSceneObject; class plSceneObject;
class plMessage; class plMessage;

4
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.cpp

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plLightModifier.h" #include "plLightModifier.h"
#include "../plGLight/plLightInfo.h" #include "plGLight/plLightInfo.h"
#include "../plInterp/plController.h" #include "plInterp/plController.h"
#include "hsStream.h" #include "hsStream.h"
#include "hsResMgr.h" #include "hsResMgr.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plLightModifier.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLightModifier_inc #ifndef plLightModifier_inc
#define plLightModifier_inc #define plLightModifier_inc
#include "../../PubUtilLib/plModifier/plSimpleModifier.h" #include "plModifier/plSimpleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
class plController; class plController;

22
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.cpp

@ -43,22 +43,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plLineFollowMod.h" #include "plLineFollowMod.h"
#include "plStereizer.h" #include "plStereizer.h"
#include "../plInterp/plAnimPath.h" #include "plInterp/plAnimPath.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnMessage/plRefMsg.h" #include "pnMessage/plRefMsg.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plDrawInterface.h" #include "pnSceneObject/plDrawInterface.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "../pnMessage/plPlayerPageMsg.h" #include "pnMessage/plPlayerPageMsg.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "hsTimer.h" #include "hsTimer.h"
plLineFollowMod::plLineFollowMod() plLineFollowMod::plLineFollowMod()

2
Sources/Plasma/FeatureLib/pfAnimation/plLineFollowMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plLineFollowMod_inc #ifndef plLineFollowMod_inc
#define plLineFollowMod_inc #define plLineFollowMod_inc
#include "../pnModifier/plMultiModifier.h" #include "pnModifier/plMultiModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"

6
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp

@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plRandomCommandMod.h" #include "plRandomCommandMod.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../pnMessage/plEventCallbackMsg.h" #include "pnMessage/plEventCallbackMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "hsUtils.h" #include "hsUtils.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plRandomCommandMod_inc #ifndef plRandomCommandMod_inc
#define plRandomCommandMod_inc #define plRandomCommandMod_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsTemplates.h" #include "hsTemplates.h"
class plRandomCommandMod : public plSingleModifier class plRandomCommandMod : public plSingleModifier

6
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp

@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plStereizer.h" #include "plStereizer.h"
#include "plLineFollowMod.h" #include "plLineFollowMod.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "hsFastMath.h" #include "hsFastMath.h"

2
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plStereizer_inc #ifndef plStereizer_inc
#define plStereizer_inc #define plStereizer_inc
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsMatrix44.h" #include "hsMatrix44.h"

14
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.cpp

@ -43,16 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plViewFaceModifier.h" #include "plViewFaceModifier.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "hsFastMath.h" #include "hsFastMath.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "../plMessage/plRenderMsg.h" #include "plMessage/plRenderMsg.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plMessage/plAvatarMsg.h" #include "plMessage/plAvatarMsg.h"
#include "../plAvatar/plAvBrainHuman.h" #include "plAvatar/plAvBrainHuman.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
plViewFaceModifier::plViewFaceModifier() plViewFaceModifier::plViewFaceModifier()
: fFacePoint(0,0,0), : fFacePoint(0,0,0),

2
Sources/Plasma/FeatureLib/pfAnimation/plViewFaceModifier.h

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "hsBounds.h" #include "hsBounds.h"
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class plGenRefMsg; class plGenRefMsg;
class plPipeline; class plPipeline;

25
Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt

@ -0,0 +1,25 @@
include_directories(../../CoreLib)
include_directories(../../FeatureLib)
include_directories(../../NucleusLib)
include_directories(../../NucleusLib/inc)
include_directories(../../PubUtilLib)
#include_directories(../../PubUtilLib/inc)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENAL_INCLUDE_DIR})
set(pfAudio_SOURCES
plListener.cpp
plRandomSoundMod.cpp
)
set(pfAudio_HEADERS
pfAudioCreatable.h
plListener.h
plRandomSoundMod.h
)
add_library(pfAudio STATIC ${pfAudio_SOURCES} ${pfAudio_HEADERS})
source_group("Source Files" FILES ${pfAudio_SOURCES})
source_group("Header Files" FILES ${pfAudio_HEADERS})

2
Sources/Plasma/FeatureLib/pfAudio/pfAudioCreatable.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef pfAudioCreatable_inc #ifndef pfAudioCreatable_inc
#define pfAudioCreatable_inc #define pfAudioCreatable_inc
#include "../pnFactory/plCreator.h" #include "pnFactory/plCreator.h"
#include "plListener.h" #include "plListener.h"

30
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp

@ -43,21 +43,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plListener.h" #include "plListener.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../pnMessage/plTimeMsg.h" #include "pnMessage/plTimeMsg.h"
#include "../pnMessage/plAudioSysMsg.h" #include "pnMessage/plAudioSysMsg.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plSimulationInterface.h" #include "pnSceneObject/plSimulationInterface.h"
#include "../pfCamera/plVirtualCamNeu.h" #include "pfCamera/plVirtualCamNeu.h"
#include "../plMessage/plListenerMsg.h" #include "plMessage/plListenerMsg.h"
#include "../plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#include "../plPipeline/plDebugText.h" #include "plPipeline/plDebugText.h"
#include "../plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "../plAvatar/plPhysicalControllerCore.h" #include "plAvatar/plAvCallbackAction.h"
hsBool plListener::fPrintDbgInfo = false; hsBool plListener::fPrintDbgInfo = false;

2
Sources/Plasma/FeatureLib/pfAudio/plListener.h

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plListener_h #ifndef plListener_h
#define plListener_h #define plListener_h
#include "../pnModifier/plSingleModifier.h" #include "pnModifier/plSingleModifier.h"
class plSceneObject; class plSceneObject;

16
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp

@ -42,16 +42,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "plRandomSoundMod.h" #include "plRandomSoundMod.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnSceneObject/plAudioInterface.h" #include "pnSceneObject/plAudioInterface.h"
#include "../pnMessage/plSoundMsg.h" #include "pnMessage/plSoundMsg.h"
#include "../plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "../plAudio/plAudioSystem.h" #include "plAudio/plAudioSystem.h"
#include "../plAudio/plSound.h" #include "plAudio/plSound.h"
#include "../plAudio/plWin32GroupedSound.h" // EEK BAD #include "plAudio/plWin32GroupedSound.h" // EEK BAD
#include "plgDispatch.h" #include "plgDispatch.h"
#include "hsTimer.h" #include "hsTimer.h"
#include "../plStatusLog/plStatusLog.h" #include "plStatusLog/plStatusLog.h"
plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1) plRandomSoundModGroup::plRandomSoundModGroup() : fNumSounds(0), fIndices(nil), fGroupedIdx(-1), fCurrent(-1)
{ {

2
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plRandomSoundMod_inc #ifndef plRandomSoundMod_inc
#define plRandomSoundMod_inc #define plRandomSoundMod_inc
#include "../pfAnimation/plRandomCommandMod.h" #include "pfAnimation/plRandomCommandMod.h"
class plSound; class plSound;
struct hsPoint3; struct hsPoint3;

4
Sources/Plasma/PubUtilLib/plModifier/plSimpleModifier.h

@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plSimpleModifier_inc #ifndef plSimpleModifier_inc
#define plSimpleModifier_inc #define plSimpleModifier_inc
#include "../pnModifier/plModifier.h" #include "pnModifier/plModifier.h"
#include "../pnNetCommon/plSynchedValue.h" #include "pnNetCommon/plSynchedValue.h"
#include "../plInterp/plAnimTimeConvert.h" #include "../plInterp/plAnimTimeConvert.h"
class plSceneObject; class plSceneObject;

Loading…
Cancel
Save