Changeset 6044:5510b69cf78c in roaraudio

Timestamp:

11/10/14 12:49:26 (9 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Correct output of roar-config --cflags and --libs

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roar-config.c (modified) (2 diffs)

ChangeLog

@@ -7 +7 @@
           as they are replaced by SLFI filters 'random' and 'strobe'.
         * Changed ABI version of roard because of updates on light_dmxchannel_*().
+        * Correct output of roar-config --cflags and --libs (pr1)
 
 v. 1.0beta11 - Tue Jan 21 2014 21:04 CET

roarclients/roar-config.c

@@ -222 +222 @@
  const char * product = NULL;
  const char * provider = NULL;
+ char * path;
  int i, h;
  int cflags = 0;
@@ -286 +287 @@
   case NORMAL:
     if ( cflags || libs ) {
-     if ( cflags )
+     if ( cflags ) {
+      path = roar_libroar_get_path("prefix-inc", null_as_universal, product, provider);
+      if (path != NULL) {
+       _strcat(buf, "-I");
+       _strcat(buf, path);
+       _strcat(buf, " ");
+       roar_mm_free(path);
+      }
       _strcat(buf, flags_ptr->cflags);
-
-     if ( libs )
+     }
+
+     if ( libs ) {
+      path = roar_libroar_get_path("prefix-lib", null_as_universal, product, provider);
+      if (path != NULL) {
+       _strcat(buf, "-L");
+       _strcat(buf, path);
+       _strcat(buf, " ");
+       roar_mm_free(path);
+      }
       _strcat(buf, flags_ptr->libs);
+     }
 
      puts(buf);