dungeon_crawler

changeset 57:508540dae114

find changesets by author, revision, files, or words in the commit message
build crap
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 21 Sep 2012 01:05:35 +0300
parents f9b8bbebc9b3
children 0d4061b1e6a1
files prototype/Makefile.in prototype/configure
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/prototype/Makefile.in	Thu Sep 20 10:04:25 2012 +0300
     1.2 +++ b/prototype/Makefile.in	Fri Sep 21 01:05:35 2012 +0300
     1.3 @@ -15,9 +15,9 @@
     1.4  
     1.5  inc = -I. -Isrc -Ivmath -Idrawtext -Ikdtree `pkg-config --cflags freetype2`
     1.6  
     1.7 -CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(inc)
     1.8 +CFLAGS = -pedantic $(warn) $(dbg) $(prof) $(opt) $(inc)
     1.9  CXXFLAGS = $(CFLAGS) $(cxx11_cflags)
    1.10 -LDFLAGS = $(cxx11_ldflags) $(libgl) $(libal) -lvorbisfile -lm -lassimp -limago -lpsys `pkg-config --libs freetype2`
    1.11 +LDFLAGS = $(cxx11_ldflags) $(prof) $(libgl) $(libal) -lvorbisfile -lm -lassimp -limago -lpsys `pkg-config --libs freetype2`
    1.12  
    1.13  ifeq ($(shell uname -s), Darwin)
    1.14  	libgl = -framework OpenGL -framework GLUT -lglew

     2.1 --- a/prototype/configure	Thu Sep 20 10:04:25 2012 +0300
     2.2 +++ b/prototype/configure	Fri Sep 21 01:05:35 2012 +0300
     2.3 @@ -2,6 +2,7 @@
     2.4  
     2.5  opt=false
     2.6  dbg=true
     2.7 +profiling=false
     2.8  
     2.9  while [ $# -gt 0 ]; do
    2.10  	case $1 in
    2.11 @@ -9,10 +10,10 @@
    2.12  		PREFIX=`echo $1 | sed 's/--prefix=//'`
    2.13  		;;
    2.14  	--enable-*)
    2.15 -		`echo $1 | sed 's/--enable-//'`=true
    2.16 +		export `echo $1 | sed 's/--enable-//'`=true
    2.17  		;;
    2.18  	--disable-*)
    2.19 -		`echo $1 | sed 's/--disable-//'`=false
    2.20 +		export `echo $1 | sed 's/--disable-//'`=false
    2.21  		;;
    2.22  	esac
    2.23  	shift
    2.24 @@ -26,6 +27,9 @@
    2.25  if $dbg; then
    2.26  	echo 'dbg = -g' >>Makefile
    2.27  fi
    2.28 +if $profiling; then
    2.29 +	echo 'prof = -pg' >>Makefile
    2.30 +fi
    2.31  
    2.32  # determine the C++11 flags we need to pass to the C++ compiler
    2.33  if [ -z "$CXX" ]; then