1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00

Terrible hacks to make pnProduct work on Linux.

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

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
#include "pnUtils/pnUtils.h"
//#include "pnUtils/pnUtils.h"
#include "plUUID/plUUID.h"
#include "pnPrBuildId.h"
#include "pnPrBranchId.h"

View File

@ -61,7 +61,7 @@ namespace Uru {
static const wchar kCoreName[] = L"UruLive";
static const wchar kShortName[] = L"UruLive";
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
@ -96,7 +96,7 @@ namespace Uru {
***/
//============================================================================
const Uuid & ProductId () {
const plUUID& ProductId () {
return PRODUCT_ID;
}
@ -119,7 +119,7 @@ const wchar * ProductLongName () {
//============================================================================
void ProductString (wchar * dest, unsigned destChars) {
// Example: "UruLive.2.214 - External.Release"
StrPrintf(
swprintf(
dest,
destChars,
L"%s.%u.%u - %s.%s",

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 * ProductShortName (); // e.g: L"Uru" (filename/registry friendly)
const wchar * ProductLongName (); // e.g: L"Uru: Ages Beyond Myst" (human friendly)