-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated autotools, fixed some gcc warnings, removed 'git-log' from ve…
…rsion
- Loading branch information
Showing
3 changed files
with
12 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
AC_PREREQ(2.67) | ||
define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl | ||
AC_INIT([smrender], [[4.2.g]svnversion], [[email protected]]) | ||
AC_PREREQ([2.71]) | ||
#define([svnversion], esyscmd([sh -c "echo -n `git log --oneline | wc -l`"]))dnl | ||
AC_INIT([smrender],[[4.3.0]],[[email protected]]) | ||
AC_CONFIG_MACRO_DIR([m4]) | ||
AM_INIT_AUTOMAKE([foreign -Wall -Werror]) | ||
AM_PROG_AR | ||
LT_INIT | ||
AC_SUBST([CFLAGS], [["$CFLAGS -Wall -Wextra"]]) | ||
#AC_SUBST([CFLAGS], [["-g -Wall"]]) | ||
AC_PROG_CC_C99 | ||
AC_PROG_CC | ||
AC_PROG_LN_S | ||
AC_PROG_MKDIR_P | ||
AC_CONFIG_HEADERS([config.h]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
/* Copyright 2011-2021 Bernhard R. Fischer, 4096R/8E24F29D <[email protected]> | ||
/* Copyright 2011-2022 Bernhard R. Fischer, 4096R/8E24F29D <[email protected]> | ||
* | ||
* This file is part of smrender. | ||
* | ||
|
@@ -18,7 +18,8 @@ | |
/*! \file smrender.c | ||
* This file contains the main() function and main initialization functions. | ||
* | ||
* @author Bernhard R. Fischer | ||
* \author Bernhard R. Fischer, <[email protected]> | ||
* \date 2022/03/08 | ||
*/ | ||
|
||
#ifdef HAVE_CONFIG_H | ||
|
@@ -463,7 +464,7 @@ char *init_rd_paper(struct rdata *rd, const char *paper) | |
|
||
static void print_version(void) | ||
{ | ||
printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2021, Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>.\n" | ||
printf("Seamark renderer V" PACKAGE_VERSION ", (c) 2011-2022, Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>.\n" | ||
"See http://www.abenteuerland.at/smrender/ for more information.\n"); | ||
#ifdef HAVE_CAIRO | ||
printf("Using libcairo %s.\n", cairo_version_string()); | ||
|
@@ -1250,7 +1251,7 @@ int main(int argc, char *argv[]) | |
{ | ||
case AUTO_GRID: | ||
auto_grid(rd, &grd); | ||
// intentionally, there's no break | ||
/* fall through */ | ||
|
||
case USER_GRID: | ||
grid(rd, &grd); | ||
|