X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmain.C;h=2f167ac0df30019fc80c63701d11e6cd6ccd3016;hb=2d8ee7ae9c2f42d8c6f2d5dcc8949ef989ebd7af;hp=e13cbabe5dd830f1cc605a8624946f1e72f4b101;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/main.C b/cinelerra-5.0/cinelerra/main.C index e13cbabe..2f167ac0 100644 --- a/cinelerra-5.0/cinelerra/main.C +++ b/cinelerra-5.0/cinelerra/main.C @@ -22,6 +22,7 @@ #include "batchrender.h" #include "bcsignals.h" #include "edl.h" +#include "file.inc" #include "filexml.h" #include "fileserver.h" #include "filesystem.h" @@ -91,25 +92,6 @@ public: }; -void get_exe_path(char *result) -{ -// Get executable path - pid_t pid = getpid(); - char proc_path[BCTEXTLEN]; - int len = 0; - result[0] = 0; - sprintf(proc_path, "/proc/%d/exe", pid); - if((len = readlink(proc_path, result, BCTEXTLEN)) >= 0) - { - result[len] = 0; -//printf("Preferences::Preferences %d %s\n", __LINE__, result); - char *ptr = strrchr(result, '/'); - if(ptr) *ptr = 0; - } - -} - - int main(int argc, char *argv[]) { // handle command line arguments first @@ -125,6 +107,7 @@ int main(int argc, char *argv[]) char batch_path[BCTEXTLEN]; char locale_path[BCTEXTLEN]; char exe_path[BCTEXTLEN]; + char env_path[BCTEXTLEN]; int nice_value = 20; int start_remote_control = 0; config_path[0] = 0; @@ -134,6 +117,8 @@ int main(int argc, char *argv[]) get_exe_path(exe_path); + snprintf(env_path, sizeof(env_path), "CINELERRA_PATH=%s", exe_path); + putenv(env_path); sprintf(locale_path, "%s%s", exe_path, LOCALEDIR);