From a750616530fd0576620c2d24d6f71002500f4163 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sat, 7 Feb 2015 15:33:04 -0800 Subject: [PATCH] Remove unused pnUtMisc code. --- .../Plasma/NucleusLib/pnUtils/CMakeLists.txt | 13 +-- .../NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp | 60 ------------ .../Plasma/NucleusLib/pnUtils/pnUtMisc.cpp | 91 ------------------- Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h | 72 --------------- 4 files changed, 1 insertion(+), 235 deletions(-) delete mode 100644 Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp delete mode 100644 Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp delete mode 100644 Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h diff --git a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt index b1fac80f..03610c9d 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt @@ -10,7 +10,6 @@ set(pnUtils_HEADERS pnUtCrypt.h pnUtHash.h pnUtList.h - pnUtMisc.h pnUtPragma.h pnUtPriQ.h pnUtSort.h @@ -23,21 +22,11 @@ set(pnUtils_SOURCES pnUtCrypt.cpp pnUtHash.cpp pnUtList.cpp - pnUtMisc.cpp pnUtStr.cpp pnUtTime.cpp ) -if(WIN32) - set(pnUtils_WIN32 - Win32/pnUtW32Misc.cpp - ) -endif(WIN32) - -add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_SOURCES} ${pnUtils_WIN32}) +add_library(pnUtils STATIC ${pnUtils_HEADERS} ${pnUtils_SOURCES}) source_group("Header Files" FILES ${pnUtils_HEADERS}) source_group("Source Files" FILES ${pnUtils_SOURCES}) -if(WIN32) - source_group("Win32" FILES ${pnUtils_WIN32}) -endif(WIN32) diff --git a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp deleted file mode 100644 index 645e4c1d..00000000 --- a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp -* -***/ - -#include "../pnUtils.h" - -/***************************************************************************** -* -* Exports -* -***/ - -//============================================================================ -const wchar_t * AppGetCommandLine () { - return GetCommandLineW(); -} - diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp deleted file mode 100644 index 76ad8bd2..00000000 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp -* -***/ - -#include "pnUtMisc.h" - - -/***************************************************************************** -* -* Private data -* -***/ - -static void * s_moduleInstance; - - -/***************************************************************************** -* -* Public functions -* -***/ - -//============================================================================ -void ModuleSetInstance (void * instance) { - s_moduleInstance = instance; -} - -//============================================================================ -void * ModuleGetInstance () { - return s_moduleInstance; -} - - -/***************************************************************************** -* -* Dll initialization -* -***/ - -//============================================================================ -#if HS_BUILD_FOR_WIN32 -BOOL WINAPI PreDllMain (HANDLE handle, DWORD reason, LPVOID) { - if (reason == DLL_PROCESS_ATTACH) { - ModuleSetInstance(handle); - } - return true; -} -#endif diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h deleted file mode 100644 index a416fce0..00000000 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h +++ /dev/null @@ -1,72 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h -* -***/ - -#ifndef PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTMISC_H -#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNUTILS_PRIVATE_PNUTMISC_H - -#include "Pch.h" -#include "pnUtArray.h" - -/***************************************************************************** -* -* Module instance functions -* -***/ - -void ModuleSetInstance (void * instance); -void * ModuleGetInstance (); - - -/***************************************************************************** -* -* Command line functions -* -***/ - -const wchar_t * AppGetCommandLine (); - -#endif