github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add -rpath to linker flags pointing to install directory

Browse Source 
This removes the need to have the intermediate shell script
that updates the LD_LIBRARY_PATH environment variable
This commit is contained in:
Kevin Sawicki
2012-08-22 17:49:29 -07:00
parent 08ae611ff8
commit 2d2ae3ec07
7 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Atom-Linux/client_handler.cpp
View File

@@ -11,7 +11,7 @@
#include "include/cef_frame.h"
#include "atom.h"
#include "native_handler.h"
#include "io_utils.h"
#include "atom.h"
#include <stdlib.h>
#include <gtk/gtk.h>
@@ -92,11 +92,8 @@ void ClientHandler::OnLoadStart(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefV8Value> atom = CefV8Value::CreateObject(NULL, NULL);
global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE);
std::string realLoadPath = io_utils_real_app_path("/..");
if (!realLoadPath.empty()) {
CefRefPtr<CefV8Value> loadPath = CefV8Value::CreateString(realLoadPath);
atom->SetValue("loadPath", loadPath, V8_PROPERTY_ATTRIBUTE_NONE);
}
CefRefPtr<CefV8Value> loadPath = CefV8Value::CreateString(AppPath());
atom->SetValue("loadPath", loadPath, V8_PROPERTY_ATTRIBUTE_NONE);
CefRefPtr<CefV8Value> bootstrapScript = CefV8Value::CreateString(
"single-window-bootstrap");