From a5181b716eb22db9a471da2195d59a3cfc900382 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 8 Apr 2011 01:29:34 -0400 Subject: [PATCH] Start CMake-ifying NucleusLib (cherry picked from commit 93ac5b22a91f2576edc6add576b3c879725bcf09) --- .gitignore | 1 + Sources/Plasma/NucleusLib/CMakeLists.txt | 9 +++ .../NucleusLib/pnAddrInfo/CMakeLists.txt | 14 ++++ .../NucleusLib/pnAsyncCore/CMakeLists.txt | 22 +++++++ .../NucleusLib/pnAsyncCoreExe/CMakeLists.txt | 64 +++++++++++++++++++ .../Plasma/NucleusLib/pnCrash/CMakeLists.txt | 16 +++++ .../NucleusLib/pnCrashExe/CMakeLists.txt | 28 ++++++++ .../pnCrashExe/Win32/pnCreError.cpp | 8 --- .../Plasma/NucleusLib/pnCsrCli/CMakeLists.txt | 16 +++++ .../Plasma/NucleusLib/pnCsrNet/CMakeLists.txt | 16 +++++ .../NucleusLib/pnDispatch/CMakeLists.txt | 19 ++++++ .../NucleusLib/pnDispatch/plDispatch.cpp | 14 ++-- .../Plasma/NucleusLib/pnDispatch/plDispatch.h | 2 +- .../pnDispatch/pnDispatchCreatable.h | 2 +- .../NucleusLib/pnFactory/CMakeLists.txt | 18 ++++++ .../Plasma/NucleusLib/pnFactory/plFactory.cpp | 2 +- 16 files changed, 233 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 Sources/Plasma/NucleusLib/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt create mode 100644 Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..07ed7069 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/* \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt new file mode 100644 index 00000000..0ea09368 --- /dev/null +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(pnAddrInfo) +add_subdirectory(pnAsyncCore) +add_subdirectory(pnAsyncCoreExe) +add_subdirectory(pnCrash) +add_subdirectory(pnCrashExe) +add_subdirectory(pnCsrCli) +add_subdirectory(pnCsrNet) +add_subdirectory(pnDispatch) +add_subdirectory(pnFactory) diff --git a/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt new file mode 100644 index 00000000..680ebac7 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAddrInfo/CMakeLists.txt @@ -0,0 +1,14 @@ +include_directories(../../CoreLib) + +set(pnAddrInfo_SOURCES + pnAddrInfo.cpp +) + +set(pnAddrInfo_HEADERS + pnAddrInfo.h +) + +add_library(pnAddrInfo STATIC ${pnAddrInfo_SOURCES} ${pnAddrInfo_HEADERS}) + +source_group("Source Files" FILES ${pnAddrInfo_SOURCES}) +source_group("Header Files" FILES ${pnAddrInfo_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt new file mode 100644 index 00000000..492111ff --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnAsyncCore_HEADERS + Pch.h +) + +set(pnAsyncCore_PRIVATE + pnAsyncCore.h + Private/pnAcAllIncludes.h + Private/pnAcCore.h + Private/pnAcIo.h + Private/pnAcLog.cpp + Private/pnAcLog.h + Private/pnAcThread.h + Private/pnAcTimer.h +) + +add_library(pnAsyncCore STATIC ${pnAsyncCore_PRIVATE} ${pnAsyncCore_HEADERS}) + +source_group("Header Files" FILES ${pnAsyncCore_HEADERS}) +source_group("Private" FILES ${pnAsyncCore_PRIVATE}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt new file mode 100644 index 00000000..0fe44fb0 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/CMakeLists.txt @@ -0,0 +1,64 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnAsyncCoreExe_SOURCES + pnAceCore.cpp + pnAceIo.cpp + pnAceLog.cpp + pnAceThread.cpp + pnAceTimer.cpp +) + +set(pnAsyncCoreExe_HEADERS + Pch.h +) + +set(pnAysncCoreExe_PRIVATE + Private/pnAceInt.h +) + +# I would do platform specific stuff here, +# but Pch.h just includes everything, so... + +set(pnAysncCoreExe_PRIVATE_NT + Private/Nt/pnAceNt.cpp + Private/Nt/pnAceNt.h + Private/Nt/pnAceNtFile.cpp + Private/Nt/pnAceNtInt.h + Private/Nt/pnAceNtSocket.cpp + Private/Nt/pnAceNtThread.cpp +) + +set(pnAsyncCoreExe_PRIVATE_UNIX + Private/Unix/pnAceUx.h +) + +set(pnAsyncCoreExe_PRIVATE_W9X + Private/W9x/pnAceW9x.cpp + Private/W9x/pnAceW9x.h + Private/W9x/pnAceW9xFile.cpp + Private/W9x/pnAceW9xInt.h + Private/W9x/pnAceW9xSocket.cpp + Private/W9x/pnAceW9xThread.cpp +) + +set(pnAsyncCoreExe_PRIVATE_WIN32 + Private/Win32/pnAceW32Dns.cpp + Private/Win32/pnAceW32Thread.cpp +) + +# End questionable part + +add_library(pnAsyncCoreExe STATIC + ${pnAsyncCoreExe_SOURCES} ${pnAsyncCoreExe_HEADERS} + ${pnAsyncCoreExe_PRIVATE} ${pnAysncCoreExe_PRIVATE_NT} + ${pnAsyncCoreExe_PRIVATE_UNIX} ${pnAsyncCoreExe_PRIVATE_W9X} + ${pnAsyncCoreExe_PRIVATE_WIN32}) + +source_group("Source Files" FILES ${pnAsyncCoreExe_SOURCES}) +source_group("Header Files" FILES ${pnAsyncCoreExe_HEADERS}) +source_group("Private" FILES ${pnAsyncCoreExe_PRIVATE}) +source_group("Private\\Nt" FILES ${pnAysncCoreExe_PRIVATE_NT}) +source_group("Private\\Unix" FILES ${pnAsyncCoreExe_PRIVATE_UNIX}) +source_group("Private\\W9x" FILES ${pnAsyncCoreExe_PRIVATE_W9X}) +source_group("Private\\Win32" FILES ${pnAsyncCoreExe_PRIVATE_WIN32}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt new file mode 100644 index 00000000..855787ba --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCrash/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCrash_SOURCES + pnCrash.cpp +) + +set(pnCrash_HEADERS + Pch.h + pnCrash.h +) + +add_library(pnCrash STATIC ${pnCrash_SOURCES} ${pnCrash_HEADERS}) + +source_group("Source Files" FILES ${pnCrash_SOURCES}) +source_group("Header Files" FILES ${pnCrash_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt new file mode 100644 index 00000000..7ad94a57 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCrashExe/CMakeLists.txt @@ -0,0 +1,28 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCrashExe_SOURCES + +) + +set(pnCrashExe_HEADERS + Pch.h +) + +if(WIN32 AND NOT CYGWIN) + set (pnCrashExe_SOURCES ${pnCrashExe_SOURCES} + Win32/pnCreError.cpp + Win32/pnCreGui.cpp + Win32/pnCreMail.cpp + Win32/pnCreTools.cpp + ) + + set (pnCrashExe_HEADERS ${pnCrashExe_HEADERS} + Win32/W32Int.h + ) +endif(WIN32 AND NOT CYGWIN) + +add_library(pnCrashExe STATIC ${pnCrashExe_SOURCES} ${pnCrashExe_HEADERS}) + +source_group("Source Files" FILES ${pnCrashExe_SOURCES}) +source_group("Header Files" FILES ${pnCrashExe_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp index 2023da2f..66dc57e5 100644 --- a/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp +++ b/Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreError.cpp @@ -173,8 +173,6 @@ static void ReplaceEmailParams (EmailParams * newParams) { //============================================================================ static EmailParams * GetEmailParamsIncRef () { - ref(GetEmailParamsIncRef); - EmailParams * params; SAFE_CRITSECT_ENTER(); @@ -275,8 +273,6 @@ static unsigned ProcessErrorLog ( const char programName[], const char errorType[] ) { - ref(programName); - ref(errorType); LogWriteToDisk(log); @@ -686,8 +682,6 @@ static LONG ProcessException (const char occasion[], EXCEPTION_POINTERS * ep) { //============================================================================ static LONG WINAPI ExceptionFilter (EXCEPTION_POINTERS * ep) { - ref(ExceptionFilter); - LONG result = ProcessException("Unhandled Exception", ep); // If the instruction pointer is inside CrashFunc then this exception @@ -799,8 +793,6 @@ static void ProcessDeadlock_CS (const char occasion[], bool crashIt = true) { //============================================================================ static void DeadlockCheckProc (void *) { - ref(DeadlockCheckProc); - while (s_running) { Sleep(5 * 1000); diff --git a/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt new file mode 100644 index 00000000..da5b045d --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCsrCli/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCsrCli_SOURCES + pnCsrCli.cpp +) + +set(pnCsrCli_HEADERS + Pch.h + pnCsrCli.h +) + +add_library(pnCsrCli STATIC ${pnCsrCli_SOURCES} ${pnCsrCli_HEADERS}) + +source_group("Source Files" FILES ${pnCsrCli_SOURCES}) +source_group("Header Files" FILES ${pnCsrCli_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt new file mode 100644 index 00000000..b942717b --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnCsrNet/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) + +set(pnCsrNet_SOURCES + pnCsrNet.cpp +) + +set(pnCsrNet_HEADERS + Pch.h + pnCsrNet.h +) + +add_library(pnCsrNet STATIC ${pnCsrNet_SOURCES} ${pnCsrNet_HEADERS}) + +source_group("Source Files" FILES ${pnCsrNet_SOURCES}) +source_group("Header Files" FILES ${pnCsrNet_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt new file mode 100644 index 00000000..381d8318 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) + +set(pnDispatch_SOURCES + plDispatch.cpp + plDispatchLogBase.cpp +) + +set(pnDispatch_HEADERS + plDispatch.h + plDispatchLogBase.h + pnDispatchCreatable.h +) + +add_library(pnDispatch STATIC ${pnDispatch_SOURCES} ${pnDispatch_HEADERS}) + +source_group("Source Files" FILES ${pnDispatch_SOURCES}) +source_group("Header Files" FILES ${pnDispatch_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp index a2076b89..c8cf74d8 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp +++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.cpp @@ -44,15 +44,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "plDispatch.h" #define PLMESSAGE_PRIVATE -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/hsKeyedObject.h" #include "hsTimer.h" -#include "../pnMessage/plTimeMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plTimeMsg.h" +#include "pnKeyedObject/plKey.h" #include "plDispatchLogBase.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" -#include "../pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/pnNetCommon.h" #include "hsThread.h" #include "plProfile.h" diff --git a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h index 8be138fb..ba3e7f03 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h +++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plgDispatch.h" #include "hsThread.h" -#include "../pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/hsKeyedObject.h" #pragma warning(disable: 4284) diff --git a/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h b/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h index 41f8b55c..a91dfdf5 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h +++ b/Sources/Plasma/NucleusLib/pnDispatch/pnDispatchCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pnDispatchCreatable_inc #define pnDispatchCreatable_inc -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" #include "plDispatch.h" diff --git a/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt new file mode 100644 index 00000000..c636c17f --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnFactory/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories(../../CoreLib) +include_directories(../../NucleusLib) +include_directories(../../NucleusLib/inc) + +set(pnFactory_SOURCES + plFactory.cpp +) + +set(pnFactory_HEADERS + plCreatable.h + plCreator.h + plFactory.h +) + +add_library(pnFactory STATIC ${pnFactory_SOURCES} ${pnFactory_HEADERS}) + +source_group("Source Files" FILES ${pnFactory_SOURCES}) +source_group("Header Files" FILES ${pnFactory_HEADERS}) \ No newline at end of file diff --git a/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp b/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp index 7b671b06..32c12dc3 100644 --- a/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp +++ b/Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsUtils.h" // For class names -#include "../NucleusLib/inc/plCreatableStrings.h" +#include "plCreatableStrings.h" static plFactory* theFactory = nil;