Refactor build flags

This commit is contained in:
topjohnwu
2019-02-12 05:17:02 -05:00
parent b3fd79cbb9
commit ed027ec3ee
12 changed files with 27 additions and 24 deletions

View File

@ -70,7 +70,7 @@ static void *request_handler(void *args) {
su_daemon_handler(client, &credential);
break;
case CHECK_VERSION:
write_string(client, xstr(MAGISK_VERSION) ":MAGISK");
write_string(client, MAGISK_VERSION ":MAGISK");
close(client);
break;
case CHECK_VERSION_CODE:
@ -109,7 +109,7 @@ static void main_daemon() {
xdup2(fd, STDIN_FILENO);
close(fd);
LOGI("Magisk v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") daemon started\n");
LOGI(SHOW_VER(Magisk) " daemon started\n");
// Get server stat
stat("/proc/self/exe", &SERVER_STAT);

View File

@ -13,7 +13,7 @@
[[noreturn]] static void usage() {
fprintf(stderr,
"Magisk v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu) multi-call binary\n"
FULL_VER(Magisk) " multi-call binary\n"
"\n"
"Usage: magisk [applet [arguments]...]\n"
" or: magisk [options]...\n"
@ -48,7 +48,7 @@ int magisk_main(int argc, char *argv[]) {
if (argc < 2)
usage();
if (strcmp(argv[1], "-c") == 0) {
printf("%s (%d)\n", xstr(MAGISK_VERSION) ":MAGISK", MAGISK_VER_CODE);
printf(MAGISK_VERSION ":MAGISK (" str(MAGISK_VER_CODE) ")\n");
return 0;
} else if (strcmp(argv[1], "-v") == 0) {
int fd = connect_daemon();