mirror-github-bspeice/flam3
1
0
Fork 0
mirror of https://github.com/scottdraves/flam3.git synced 2025-01-21 05:20:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from scottdraves/erik_dev

Browse Source 
switched to git version rather than subversion
This commit is contained in:
Scott Draves 2015-04-26 11:34:50 -04:00
commit 01f29fe20c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"' GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF) AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

4
Makefile.in
View File

@ -359,8 +359,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies AUTOMAKE_OPTIONS = foreign no-dependencies
SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"' GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"'
AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF) AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF)
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
man1_MANS = flam3-animate.man flam3-genome.man flam3-render.man flam3-convert.man man1_MANS = flam3-animate.man flam3-genome.man flam3-render.man flam3-convert.man
lib_LTLIBRARIES = libflam3.la lib_LTLIBRARIES = libflam3.la

4
flam3.c
View File

@ -61,8 +61,8 @@
char *flam3_version() { char *flam3_version() {
if (strcmp(SVN_REV, "exported")) if (strcmp(GIT_REV, ""))
return flam3_os "-" VERSION "." SVN_REV; return flam3_os "-" VERSION "." GIT_REV;
return flam3_os "-" VERSION; return flam3_os "-" VERSION;
} }