Commit ac6d6849 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'define-custom-gui-path'

parents 65f1a0ef 3465776b
Pipeline #1389 passed with stage
in 346 minutes and 48 seconds
...@@ -12,6 +12,17 @@ that didn't really belong anywhere. */ ...@@ -12,6 +12,17 @@ that didn't really belong anywhere. */
#include "m_imp.h" #include "m_imp.h"
#include "g_canvas.h" /* for GUI queueing stuff */ #include "g_canvas.h" /* for GUI queueing stuff */
/* Use this if you want to point the guidir at a local copy of the
* repo while developing. Then recompile and copy the pd-l2ork binary
* to the system path. After that you can make changes to the gui code
* in purr-data/pd/nw and test them without having to recompile the
* pd-l2ork binary.
* If you do this, make sure you have run tar_em_up.sh first to fetch and
* extract the nw binary to purr-data/pd/nw/nw
*/
#define GUIDIR "" /* "/home/user/purr-data/pd/nw" */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#else // if isatty exists outside unistd, please add another #ifdef #else // if isatty exists outside unistd, please add another #ifdef
...@@ -1411,10 +1422,11 @@ int sys_startgui(const char *guidir) ...@@ -1411,10 +1422,11 @@ int sys_startgui(const char *guidir)
strcpy(guidir2, "\""); strcpy(guidir2, "\"");
strcat(guidir2, guidir); strcat(guidir2, guidir);
strcat(guidir2, "\""); strcat(guidir2, "\"");
/* Uncomment the following line if you want to /* The following line checks if our GUIDIR was defined
use the nw binary and GUI code from your local to something other than empty string. If so it will
copy of the Purr Data repo. (Make sure to run use that dir to find the nw binary. */
tar_em_up.sh first to fetch the nw binary.) */ if (strcmp(GUIDIR, ""))
strcpy(guidir2, "\"" GUIDIR "\"");
//strcpy(guidir2, "\"/home/user/purr-data/pd/nw\""); //strcpy(guidir2, "\"/home/user/purr-data/pd/nw\"");
sprintf(cmdbuf, sprintf(cmdbuf,
"\"%s\" %s %s " "\"%s\" %s %s "
...@@ -1452,10 +1464,11 @@ int sys_startgui(const char *guidir) ...@@ -1452,10 +1464,11 @@ int sys_startgui(const char *guidir)
strcpy(guidir2, "\""); strcpy(guidir2, "\"");
strcat(guidir2, guidir); strcat(guidir2, guidir);
strcat(guidir2, "\""); strcat(guidir2, "\"");
/* Uncomment the following line if you want to /* The following line checks if our GUIDIR was defined
use the nw binary and GUI code from your local to something other than empty string. If so it will
copy of the Purr Data repo. (Make sure to run use that dir to find the nw binary. */
tar_em_up.sh first to fetch the nw binary.) */ if (strcmp(GUIDIR, ""))
strcpy(guidir2, "\"" GUIDIR "\"");
//strcpy(guidir2, "\"/home/user/purr-data/pd/nw\""); //strcpy(guidir2, "\"/home/user/purr-data/pd/nw\"");
sprintf(cmdbuf, sprintf(cmdbuf,
"%s/nw/nw %s %s " "%s/nw/nw %s %s "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment