subprojects/spp: update README and code

librz/arch/asm.c

@@ -14,7 +14,7 @@
 #include <rz_util.h>
 #include <rz_lib.h>
 #include <rz_asm.h>
-#define USE_R2 1
+#define USE_RZ_UTIL 1
 #include <spp.h>
 
 /**

subprojects/rzspp/README.md

@@ -16,20 +16,9 @@ in any language in some specific places of the document.
 Build
 -----
 
-You can tweak some options with `./configure` (or copying your favourite `config.mk`)
-
 ```
-Optional Features:
-  --without-fork         build without depending on fork syscall
-  --enable-r2            compile against r2 r_util
-```
-
-The way to build is as easy as in any GNU program:
-
-```
-$ ./configure --prefix=/usr
-$ make
-$ make install
+$ meson setup build
+$ ninja -C build
 ```
 
 Usage
@@ -94,7 +83,7 @@ spp specific flags:
 Preprocessors
 =============
 
-There are 5 preprocessors that are available in spp by default.
+There are 3 preprocessors that are available in spp by default.
 You can write your own and just pass the struct reference as
 argument.
 
@@ -132,5 +121,3 @@ ASM
 .include t/syscalls.asm
 int3
 ```
-
-...

subprojects/rzspp/meson.build

@@ -11,7 +11,7 @@ rz_util_dep = dependency('rz_util')
 librzspp = static_library('rzspp', spp_files,
   dependencies: [rz_util_dep],
   include_directories: spp_inc,
-  c_args: ['-DHAVE_R_UTIL', '-DUSE_R2=1'],
+  c_args: ['-DUSE_RZ_UTIL=1'],
   implicit_include_directories: false
 )
 

subprojects/rzspp/rz_api.h

@@ -14,7 +14,7 @@ void out_printf(Output *out, char *str, ...);
 void out_printf(Output *out, char *str, ...) __attribute__ ((format (printf, 2, 3)));
 #endif
 
-#if USE_R2
+#if USE_RZ_UTIL
 #include <rz_util.h>
 #else
 SStrBuf *rz_strbuf_new(const char *s);

subprojects/rzspp/spp.c

@@ -4,7 +4,7 @@
 #include "rz_api.h"
 #include "config.h"
 
-#if !USE_R2
+#if !USE_RZ_UTIL
 #include "rz_api.c"
 #endif
 

subprojects/rzspp/spp.h

@@ -77,7 +77,7 @@ struct Tag *tags = (struct Tag *)&x##_tags; \
 struct Arg *args = (struct Arg *)&x##_args; \
 struct Proc *proc = &x##_proc;
 
-#if USE_R2
+#if USE_RZ_UTIL
 #include <rz_util.h>
 #define SStrBuf RzStrBuf
 #else