aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #1153 Make ryzom_client run completely in an .app bundle

Browse source
This commit is contained in:
rti 2010-11-03 13:39:35 +01:00
parent fe9d8dbd8a
commit 5033d70471
4 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
View file

@ -231,7 +231,11 @@ void CCocoaEventEmitter::init(NL3D::IDriver* driver, CocoaOpenGLView* glView)
bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
{
if(!server && !_server)
nlerror("no server to post events to");
{
// nlerror("no server to post events to");
nldebug("no server to post events to");
return true;
}
if(!server)
server = _server;

5
code/nel/src/misc/path.cpp
View file

@ -1700,6 +1700,9 @@ std::string CFileContainer::getApplicationDirectory(const std::string &appName)
wchar_t buffer[MAX_PATH];
SHGetSpecialFolderPathW(NULL, buffer, CSIDL_APPDATA, TRUE);
appPath = CPath::standardizePath(ucstring((ucchar*)buffer).toUtf8());
#elif defined(NL_OS_MAC)
appPath = CPath::standardizePath(getenv("HOME"));
appPath += "/Library/Preferences/";
#else
appPath = CPath::standardizePath(getenv("HOME"));
#endif
@ -1709,6 +1712,8 @@ std::string CFileContainer::getApplicationDirectory(const std::string &appName)
#ifdef NL_OS_WINDOWS
if (!appName.empty())
path = CPath::standardizePath(path + appName);
#elif defined(NL_OS_MAC)
path = CPath::standardizePath(path + appName);
#else
if (!appName.empty())
path = CPath::standardizePath(path + "." + toLower(appName));

5
code/ryzom/client/src/CMakeLists.txt
View file

@ -97,6 +97,11 @@ IF(NOT APPLE AND NOT WIN32)
TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
ENDIF(NOT APPLE AND NOT WIN32)
IF(APPLE)
FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY})
ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS})
NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")

43
code/ryzom/client/src/client.cpp
View file

@ -33,6 +33,8 @@
#ifdef NL_OS_MAC
#include <stdio.h>
#include <sys/resource.h>
#include <CoreFoundation/CoreFoundation.h>
#include "nel/misc/dynloadlib.h"
#endif
#include "nel/misc/debug.h"
@ -350,6 +352,47 @@ int main(int argc, char **argv)
// init the Nel context
CApplicationContext *appContext = new CApplicationContext;
#if defined(NL_OS_MAC)
// get the bundle
CFBundleRef bundle = CFBundleGetMainBundle();
if(bundle)
{
// get the url to the bundles root
CFURLRef url = CFBundleCopyBundleURL(bundle);
if(url)
{
// get the file system path
CFStringRef str;
str = CFURLCopyFileSystemPath(
CFURLCopyAbsoluteURL(url), kCFURLPOSIXPathStyle);
CFRelease(url);
if(str)
{
std::string pathToBundle = CFStringGetCStringPtr(
str, CFStringGetSmallestEncoding(str));
CFRelease(str);
// change the working directory
nldebug("Bundle Path is %s", pathToBundle.c_str());
nldebug("setCurrentPath %s", (pathToBundle + "/Contents/Resources/").c_str());
CPath::setCurrentPath(pathToBundle + "/Contents/Resources/");
// add the search path for plugins (nel drivers)
nldebug("addLibPath %s", (pathToBundle + "/Contents/PlugIns/nel/").c_str());
CLibrary::addLibPath(pathToBundle + "/Contents/PlugIns/nel/");
}
else
nlerror("CFStringGetCStringPtr");
}
else
nlerror("CFBundleCopyBundleURL");
}
else
nlerror("CFBundleGetMainBundle");
#endif
createDebug();
#ifndef NL_DEBUG