OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Terrible hacks to make pnProduct work on Linux.

Browse Source 
plUUID has a conversion operator to pnUtil's Uuid class.
We're counting on this to work properly on Windows (which hasn't yet
been tested)
This commit is contained in:
Darryl Pogue
2011-10-25 21:19:11 -07:00
parent 7168174e52
commit 68abe52f9c
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
include_directories("../../CoreLib") include_directories("../../CoreLib")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
set(pnProduct_HEADERS set(pnProduct_HEADERS
Pch.h Pch.h

2
Sources/Plasma/NucleusLib/pnProduct/Pch.h
View File

@ -51,6 +51,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PCH_H #define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNPRODUCT_PCH_H
#include "pnUtils/pnUtils.h" //#include "pnUtils/pnUtils.h"
#include "Private/pnPrAllIncludes.h" #include "Private/pnPrAllIncludes.h"

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

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

6
Sources/Plasma/NucleusLib/pnProduct/Private/pnPrProductId.cpp
View File

@ -61,7 +61,7 @@ namespace Uru {
static const wchar kCoreName[] = L"UruLive"; static const wchar kCoreName[] = L"UruLive";
static const wchar kShortName[] = L"UruLive"; static const wchar kShortName[] = L"UruLive";
static const wchar kLongName[] = L"Uru Live"; static const wchar kLongName[] = L"Uru Live";
static const Uuid kId(L"ea489821-6c35-4bd0-9dae-bb17c585e680"); static const plUUID kId("ea489821-6c35-4bd0-9dae-bb17c585e680");
} }
// @@@: add your product namespace here // @@@: add your product namespace here
@ -96,7 +96,7 @@ namespace Uru {
***/ ***/
//============================================================================ //============================================================================
const Uuid & ProductId () { const plUUID& ProductId () {
return PRODUCT_ID; return PRODUCT_ID;
} }
@ -119,7 +119,7 @@ const wchar * ProductLongName () {
//============================================================================ //============================================================================
void ProductString (wchar * dest, unsigned destChars) { void ProductString (wchar * dest, unsigned destChars) {
// Example: "UruLive.2.214 - External.Release" // Example: "UruLive.2.214 - External.Release"
StrPrintf( swprintf(
dest, dest,
destChars, destChars,
L"%s.%u.%u - %s.%s", L"%s.%u.%u - %s.%s",

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

@ -83,7 +83,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
* *
***/ ***/
const Uuid & ProductId (); const plUUID& ProductId ();
const wchar * ProductCoreName (); // e.g: L"Uru" const wchar * ProductCoreName (); // e.g: L"Uru"
const wchar * ProductShortName (); // e.g: L"Uru" (filename/registry friendly) const wchar * ProductShortName (); // e.g: L"Uru" (filename/registry friendly)
const wchar * ProductLongName (); // e.g: L"Uru: Ages Beyond Myst" (human friendly) const wchar * ProductLongName (); // e.g: L"Uru: Ages Beyond Myst" (human friendly)