diff options
-rw-r--r-- | flam3.c | 12 | ||||
-rw-r--r-- | flam3.h | 3 | ||||
-rw-r--r-- | img.h | 1 | ||||
-rw-r--r-- | interpolation.c | 1 | ||||
-rw-r--r-- | interpolation.h | 1 | ||||
-rw-r--r-- | main.c | 14 | ||||
-rw-r--r-- | math.h | 3 | ||||
-rw-r--r-- | palettes.c | 1 | ||||
-rw-r--r-- | palettes.h | 1 | ||||
-rw-r--r-- | parser.c | 1 | ||||
-rw-r--r-- | parser.h | 1 | ||||
-rw-r--r-- | png.c | 1 | ||||
-rw-r--r-- | private.h | 1 | ||||
-rw-r--r-- | rect.c | 1 | ||||
-rw-r--r-- | variations.c | 1 | ||||
-rw-r--r-- | variations.h | 1 | ||||
-rw-r--r-- | wscript | 4 |
17 files changed, 13 insertions, 35 deletions
@@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -37,11 +36,6 @@ #include <errno.h> #include <assert.h> -char *flam3_version() { - return VERSION; -} - - #define CHOOSE_XFORM_GRAIN 16384 #define CHOOSE_XFORM_GRAIN_M1 16383 @@ -1291,7 +1285,7 @@ char *flam3_print_to_string(flam3_genome *cp) { tmpflame = tmpfile(); if (NULL==tmpflame) { if (using_tmpdir == 0) { - perror("FLAM3: opening temporary file"); + perror("opening temporary file"); return (NULL); } } @@ -1300,7 +1294,7 @@ char *flam3_print_to_string(flam3_genome *cp) { fseek(tmpflame,0L, SEEK_SET); genome_string = (char *)calloc(stringbytes+1,1); if (stringbytes != fread(genome_string, 1, stringbytes, tmpflame)) { - perror("FLAM3: reading string from temp file"); + perror("reading string from temp file"); } fclose(tmpflame); @@ -1330,7 +1324,7 @@ void flam3_print(FILE *f, flam3_genome *cp, char *extra_attributes, int print_ed fprintf(stderr, "error: couldn't set C locale\n"); - fprintf(f, "<flame version=\"FLAM3-%s\" time=\"%g\"", flam3_version(),cp->time); + fprintf(f, "<flame version=\"" PACKAGE "-" VERSION "\" time=\"%g\"", cp->time); if (cp->flame_name[0]!=0) fprintf(f, " name=\"%s\"",cp->flame_name); @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -23,8 +22,6 @@ #include <stdio.h> #include <libxml/parser.h> -char *flam3_version(); - #define flam3_palette_random (-1) #define flam3_palette_interpolated (-2) @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify diff --git a/interpolation.c b/interpolation.c index 7e1d482..271330d 100644 --- a/interpolation.c +++ b/interpolation.c @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify diff --git a/interpolation.h b/interpolation.h index 8ed81cb..61ea49d 100644 --- a/interpolation.h +++ b/interpolation.h @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -29,8 +28,7 @@ #define streq(a,b) (strcmp (a, b) == 0) -const char *argp_program_version = - "vlam3-pre"; +const char *argp_program_version = PACKAGE "-" VERSION; typedef struct { unsigned int bpc; @@ -137,7 +135,7 @@ static void do_render (const render_arguments * const arguments) { } static void print_genome (flam3_genome * const genome) { - printf("<pick version=\"FLAM3-%s\">\n", flam3_version()); + printf("<pick version=\"" PACKAGE "-" VERSION "\">\n"); flam3_print (stdout, genome, NULL, flam3_dont_print_edits); printf("</pick>\n"); } @@ -431,7 +429,7 @@ int main (int argc, char **argv) { {"method", 'm', "XXX", OPTION_ARG_OPTIONAL, "Cross method" }, { 0 }, }; - const char doc[] = "vlame3-cross -- a fractal flame renderer"; + const char doc[] = PACKAGE "-cross -- a fractal flame renderer"; const struct argp argp = { .options = options, .parser = parse_cross_opt, .args_doc = NULL, .doc = doc, .children = NULL @@ -448,7 +446,7 @@ int main (int argc, char **argv) { {"method", 'm', "XXX", OPTION_ARG_OPTIONAL, "Mutation method" }, { 0 }, }; - const char doc[] = "vlame3-mutate -- a fractal flame renderer"; + const char doc[] = PACKAGE "-mutate -- a fractal flame renderer"; const struct argp argp = { .options = options, .parser = parse_mutate_opt, .args_doc = NULL, .doc = doc, .children = NULL @@ -468,7 +466,7 @@ int main (int argc, char **argv) { {"width", 'w', "pixels", 0, "Output flame width" }, { 0 }, }; - const char doc[] = "vlame3-random -- a fractal flame generator"; + const char doc[] = PACKAGE "-random -- a fractal flame generator"; const struct argp argp = { .options = options, .parser = parse_random_opt, .args_doc = NULL, .doc = doc, .children = NULL @@ -492,7 +490,7 @@ int main (int argc, char **argv) { {"cache", 'c', "path", 0, "Cache file" }, { 0 }, }; - const char doc[] = "vlame3-render -- a fractal flame renderer"; + const char doc[] = PACKAGE "-render -- a fractal flame renderer"; const struct argp argp = { .options = options, .parser = parse_render_opt, .args_doc = NULL, .doc = doc, .children = NULL, @@ -1,7 +1,6 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC - Copyright (C) 2015 vlam3 contributors + Copyright (C) 2015 pucket contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify diff --git a/variations.c b/variations.c index 41445d5..2fbcedc 100644 --- a/variations.c +++ b/variations.c @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify diff --git a/variations.h b/variations.h index bc5f29e..97c9440 100644 --- a/variations.h +++ b/variations.h @@ -1,5 +1,4 @@ /* - FLAM3 - cosmic recursive fractal flames Copyright (C) 1992-2009 Spotworks LLC This program is free software; you can redistribute it and/or modify @@ -2,7 +2,9 @@ def options(opt): opt.load ('compiler_c') def configure(conf): + conf.define (key='PACKAGE', val='pucket') conf.define (key='VERSION', val='pre') + conf.load ('compiler_c') conf.env.append_unique ('CFLAGS', '-std=gnu99') @@ -20,5 +22,5 @@ def configure(conf): conf.write_config_header ('config.h') def build(bld): - bld.program (features='c cprogram', source='flam3.c parser.c variations.c interpolation.c palettes.c png.c random.c rect.c main.c', target='vlam3', use='xml2 png amdlibm') + bld.program (features='c cprogram', source='flam3.c parser.c variations.c interpolation.c palettes.c png.c random.c rect.c main.c', target='pucket', use='xml2 png amdlibm') |