From 064c511ac7da355bff202f66329ef6d3bd22c909 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 11 Oct 2014 16:16:18 +0100 Subject: Update lv2_ttl_generator --- libs/lv2-ttl-generator/GNUmakefile | 4 ++-- libs/lv2-ttl-generator/lv2_ttl_generator.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/lv2-ttl-generator/GNUmakefile b/libs/lv2-ttl-generator/GNUmakefile index a4c9f63..0052be4 100644 --- a/libs/lv2-ttl-generator/GNUmakefile +++ b/libs/lv2-ttl-generator/GNUmakefile @@ -9,10 +9,10 @@ build: ../lv2_ttl_generator endif ../lv2_ttl_generator: lv2_ttl_generator.c - $(CXX) lv2_ttl_generator.c -o ../lv2_ttl_generator -ldl + $(CC) lv2_ttl_generator.c -o ../lv2_ttl_generator -ldl ../lv2_ttl_generator.exe: lv2_ttl_generator.c - $(CXX) lv2_ttl_generator.c -o ../lv2_ttl_generator.exe -static + $(CC) lv2_ttl_generator.c -o ../lv2_ttl_generator.exe -static touch ../lv2_ttl_generator clean: diff --git a/libs/lv2-ttl-generator/lv2_ttl_generator.c b/libs/lv2-ttl-generator/lv2_ttl_generator.c index 18b7508..5ef2b14 100644 --- a/libs/lv2-ttl-generator/lv2_ttl_generator.c +++ b/libs/lv2-ttl-generator/lv2_ttl_generator.c @@ -53,16 +53,24 @@ int main(int argc, char* argv[]) char basename[strlen(argv[1])+1]; #ifdef TTL_GENERATOR_WINDOWS - if (char* base2 = strrchr(argv[1], '\\')) + char* base2 = strrchr(argv[1], '\\'); #else - if (char* base2 = strrchr(argv[1], '/')) + char* base2 = strrchr(argv[1], '/'); #endif + if (base2 != NULL) { strcpy(basename, base2+1); basename[strrchr(base2, '.')-base2-1] = '\0'; } + else if (argv[1][0] == '.' && argv[1][1] == '/') + { + strcpy(basename, argv[1]+2); + basename[strrchr(basename, '.')-basename] = '\0'; + } else + { strcpy(basename, argv[1]); + } printf("Generate ttl data for '%s', basename: '%s'\n", argv[1], basename); -- cgit v1.2.3