diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-09-22 12:23:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-09-22 12:23:14 +0000 |
| commit | a3d7c19728e1ccf68a2fcc5167767abda558331d (patch) | |
| tree | 1c99ab5d5ed423d59a19ae5fbdd73bc6b5ef5a7f | |
| parent | 5c1f57ffdf663d57def89d9712afeb041059dfb2 (diff) | |
| download | ffmpeg-a3d7c19728e1ccf68a2fcc5167767abda558331d.tar.gz | |
Improve compiler information code to print to the console on program startup.
Remove gcc-specific hacks and allow filling relevant information for non-gcc
compilers in configure.
Originally committed as revision 19963 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | cmdutils.c | 8 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmdutils.c b/cmdutils.c index ee195879dd..ffa5957b71 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -333,12 +333,8 @@ void show_banner(void) { fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d Fabrice Bellard, et al.\n", program_name, program_birth_year, this_year); - fprintf(stderr, " built on " __DATE__ " " __TIME__); -#ifdef __GNUC__ - fprintf(stderr, ", gcc: " __VERSION__ "\n"); -#else - fprintf(stderr, ", using a non-gcc compiler\n"); -#endif + fprintf(stderr, " built on %s %s with %s %s\n", + __DATE__, __TIME__, CC_TYPE, CC_VERSION); fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); print_all_lib_versions(stderr, 1); } @@ -1261,6 +1261,7 @@ shlibdir_default="$libdir_default" # toolchain ar="ar" cc_default="gcc" +cc_version=\"unknown\" host_cc_default="gcc" ln_s="ln -sf" nm_default="nm" @@ -1516,6 +1517,7 @@ filter_asflags=echo if $cc -v 2>&1 | grep -qi ^gcc; then cc_type=gcc + cc_version=__VERSION__ if ! $cc -dumpversion | grep -q '^2\.'; then CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2703,6 +2705,8 @@ echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$(c_escape $FFMPEG_CONFIGURATION)\"" >> $TMPH echo "#define FFMPEG_DATADIR \"$(eval c_escape $datadir)\"" >> $TMPH +echo "#define CC_TYPE \"$cc_type\"" >> $TMPH +echo "#define CC_VERSION $cc_version" >> $TMPH echo "#define restrict $_restrict" >> $TMPH if enabled small || disabled optimizations; then |