OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 04:39:45 +00:00
Code Releases Activity

Move plUUID to pnUUID.

Browse Source 
--HG--
rename : Sources/Plasma/PubUtilLib/plUUID/plUUID.cpp => Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
rename : Sources/Plasma/PubUtilLib/plUUID/plUUID.h => Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
rename : Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp => Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
rename : Sources/Plasma/PubUtilLib/plUUID/plUUID_Win32.cpp => Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
This commit is contained in:
Darryl Pogue
2011-10-25 23:40:13 -07:00
parent f085087c23
commit 8a28ba9e89
21 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt
View File

@ -12,6 +12,6 @@ set(plFileEncrypt_SOURCES
)
add_executable(plFileEncrypt ${plFileEncrypt_SOURCES})
target_link_libraries(plFileEncrypt CoreLib CoreLibExe plFile plUnifiedTime pnProduct plUUID)
target_link_libraries(plFileEncrypt CoreLib CoreLibExe plFile plUnifiedTime pnUUID pnProduct)
source_group("Source Files" FILES ${plFileEncrypt_SOURCES})

7
Sources/Plasma/Apps/plFileEncrypt/main.cpp
View File

@ -44,12 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include "pnUtils/pnUtils.h"
#include "pnProduct/pnProduct.h"
#include "hsUtils.h"
/* Hack so that we can pull in the product info */
#include "pnFactory/plCreator.h"
#include "plUUID/plUUID.h"
REGISTER_CREATABLE( plCreatableUuid);
#include "pnUUID/pnUUIDCreatable.h"
void EncryptFiles(const char* dir, const char* ext, bool encrypt);

2
Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
View File

@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h"
#include "plNetCommon/plNetServerSessionInfo.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
#include <Python.h>
#include "pyGlueHelpers.h"

1
Sources/Plasma/NucleusLib/CMakeLists.txt
View File

@ -32,3 +32,4 @@ add_subdirectory(pnSimpleNet)
add_subdirectory(pnTimer)
add_subdirectory(pnUtils)
add_subdirectory(pnUtilsExe)
add_subdirectory(pnUUID)

1
Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
View File

@ -68,5 +68,6 @@ REGISTER_NONCREATABLE( plDispatchBase );
#include "pnNetCommon/pnNetCommonCreatable.h"
#include "pnSceneObject/pnSceneObjectCreatable.h"
#include "pnTimer/pnTimerCreatable.h"
#include "pnUUID/pnUUIDCreatable.h"
#endif // pnNucleusCreatables_inc

3
Sources/Plasma/NucleusLib/pnProduct/CMakeLists.txt
View File

@ -1,6 +1,5 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
set(pnProduct_HEADERS
Pch.h
@ -21,5 +20,7 @@ set(pnProduct_PRIVATE
add_library(pnProduct STATIC ${pnProduct_HEADERS} ${pnProduct_PRIVATE})
target_link_libraries(pnProduct pnUUID)
source_group("Header Files" FILES ${pnProduct_HEADERS})
source_group("Private" FILES ${pnProduct_PRIVATE})

2
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrAllIncludes.h
View File

@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include "pnUtils/pnUtils.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
#include "pnPrBuildId.h"
#include "pnPrBranchId.h"

28
Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt Normal file
View File

@ -0,0 +1,28 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
set(pnUUID_SOURCES
pnUUID.cpp
)
if(WIN32)
set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Win32.cpp)
else(WIN32)
set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Unix.cpp)
endif(WIN32)
set(pnUUID_HEADERS
pnUUID.h
pnUUIDCreatable.h
)
add_library(pnUUID STATIC ${pnUUID_SOURCES} ${pnUUID_HEADERS})
target_link_libraries(pnUUID pnFactory)
if(WIN32)
target_link_libraries(pnUUID pnUtils)
else(WIN32)
target_link_libraries(pnUUID uuid)
endif(WIN32)
source_group("Source Files" FILES ${pnUUID_SOURCES})
source_group("Header Files" FILES ${pnUUID_HEADERS})

2
Sources/Plasma/PubUtilLib/plUUID/plUUID.cpp → Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
View File

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "plUUID.h"
#include "pnUUID.h"
#include "hsStream.h"
plUUID::plUUID()

6
Sources/Plasma/PubUtilLib/plUUID/plUUID.h → Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
View File

@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#ifndef plUUID_h_inc
#define plUUID_h_inc
#ifndef pnUUID_h_inc
#define pnUUID_h_inc
#include "hsTypes.h"
#include "hsStlUtils.h"
@ -107,4 +107,4 @@ public:
};
#endif // plUUID_h_inc
#endif // pnUUID_h_inc

54
Sources/Plasma/NucleusLib/pnUUID/pnUUIDCreatable.h Normal file
View File

@ -0,0 +1,54 @@
/*==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 <http://www.gnu.org/licenses/>.
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==*/
#ifndef pnUUIDCreatable_inc
#define pnUUIDCreatable_inc
#include "pnFactory/plCreator.h"
#include "pnUUID.h"
REGISTER_CREATABLE( plCreatableUuid );
#endif // pnUUIDCreatable_inc

2
Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp → Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
View File

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "plUUID.h"
#include "pnUUID.h"
#ifdef HS_BUILD_FOR_UNIX

2
Sources/Plasma/PubUtilLib/plUUID/plUUID_Win32.cpp → Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
View File

@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "plUUID.h"
#include "pnUUID.h"
#ifdef HS_BUILD_FOR_WIN32

1
Sources/Plasma/PubUtilLib/CMakeLists.txt
View File

@ -48,5 +48,4 @@ add_subdirectory(plStreamLogger)
add_subdirectory(plSurface)
add_subdirectory(plTransform)
add_subdirectory(plUnifiedTime)
add_subdirectory(plUUID)
add_subdirectory(plVault)

2
Sources/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.h
View File

@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plAgeDescription/plAgeDescription.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
//
// A singleton class which manages loading and unloading ages and operations associated with that

2
Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h
View File

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plLoadAgeMsg_INC
#include "pnMessage/plMessage.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
#include "hsUtils.h"
//

2
Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
View File

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsConfig.h"
#include "hsStlUtils.h"
#include "pnFactory/plCreatable.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
class plClientGuid : public plCreatable
{

2
Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.cpp
View File

@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "plNetCommon.h"
#include "hsStlUtils.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
#include <algorithm>
namespace plNetCommon

4
Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonCreatable.h
View File

@ -55,10 +55,6 @@ REGISTER_CREATABLE( plNetCoreStatsSummary );
#endif // SERVER
REGISTER_CREATABLE( plCreatableListHelper );
// HACK: plUUID should have it's own creatable include
#include "../plUUID/plUUID.h"
REGISTER_CREATABLE( plCreatableUuid );
#include "plClientGuid.h"
REGISTER_CREATABLE( plClientGuid );
#include "plNetServerSessionInfo.h"

2
Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h
View File

@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnFactory/plCreatable.h"
#include "pnNetCommon/plNetServers.h"
#include "plNetCommon/plSpawnPointInfo.h"
#include "plUUID/plUUID.h"
#include "pnUUID/pnUUID.h"
class hsStream;

26
Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
View File

@ -1,26 +0,0 @@
include_directories("../../CoreLib")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
set(plUUID_SOURCES
plUUID.cpp
)
if(WIN32)
set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp)
else(WIN32)
set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Unix.cpp)
endif(WIN32)
set(plUUID_HEADERS
plUUID.h
)
add_library(plUUID STATIC ${plUUID_SOURCES} ${plUUID_HEADERS})
target_link_libraries(plUUID pnFactory)
if(NOT WIN32)
target_link_libraries(plUUID uuid)
endif(NOT WIN32)
source_group("Source Files" FILES ${plUUID_SOURCES})
source_group("Header Files" FILES ${plUUID_HEADERS})