:fire: more on embed

diff --git a/scripts/embed.bash b/scripts/embed.bash
index 907f52efc20e0d1677bdb1ba7d75341f8be4eeec..6d5f1122ade04fc23b15d508bdd112346171831c 100644 (file)
--- a/scripts/embed.bash
+++ b/scripts/embed.bash
@@ -191,10 +191,14 @@ ANN const char** config_args(int *argc, char **const argv) {
   for(int i = 0; i < config_argc; i++) {
     args[i] = config_argv[i];
   }
+#ifndef GWION_STANDALONE
   for(int i = 0; i < *argc; i++) {
     args[i + config_argc] = argv[i];
   }
   *argc = nargs;
+#else
+  *argc = config_argc;
+#endif
   return args;
 }
 EOF

diff --git a/src/arg.c b/src/arg.c
index bd92ddeac293e887f9eff3a9eb42cb0390c3cc6a..d090e700b4e0a57cc12621c95c6a17cae72eedb1 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -46,7 +46,7 @@ ANN static inline void config_end(const Vector config) {
   }
 }
 
-//#ifndef GWION_CONFIG_ARGS
+#ifndef GWION_STANDALONE
 ANN static m_str plug_dir(void) {
   const m_str  home     = getenv("HOME");
   const size_t sz       = strlen(home);
@@ -56,7 +56,7 @@ ANN static m_str plug_dir(void) {
   strcpy(plug_dir + sz, pdir);
   return plug_dir;
 }
-//#endif
+#endif
 
 enum arg_type {
   ARG_FILE,
@@ -377,14 +377,14 @@ ANN m_bool _arg_parse(struct ArgInternal *arg) {
   return GW_OK;
 }
 
-//#ifndef GWION_CONFIG_ARGS
+#ifndef GWION_STANDALONE
 ANN static void config_default(struct ArgInternal *arg) {
   char *home = getenv("HOME");
   char  c[strlen(home) + strlen(GWIONRC) + 2];
   sprintf(c, "%s/%s", home, GWIONRC);
   config_parse(arg, c);
 }
-//#endif
+#endif
 
 ANN m_bool arg_parse(const Gwion gwion, CliArg *a) {
   struct ArgInternal arg = {.gwion = gwion, .arg = a};