[Gridflow-cvs] [svn] commit: r3717 - in /trunk: Makefile configure

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri May 23 11:14:49 EDT 2008


Author: matju
Date: Fri May 23 11:14:47 2008
New Revision: 3717

Log:
changes in handling --debug; removed -fno-omit-frame-pointer; etc

Modified:
    trunk/Makefile
    trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri May 23 11:14:47 2008
@@ -10,16 +10,9 @@
 SHELL = /bin/sh
 LDSHARED = $(CXX) $(PDBUNDLEFLAGS)
 RM = rm -f
-CFLAGS += -Wall -Wno-unused -Wunused-variable
-CFLAGS += -g -fPIC -I.
+CFLAGS += -Wall -Wno-unused -Wunused-variable -g -fPIC -I.
 
 # LDFLAGS += ../gem-cvs/Gem/Gem.pd_linux
-ifeq ($(HAVE_DEBUG),yes)
-	CFLAGS += -O0
-else
-#	CFLAGS += -O3 -funroll-loops -fno-omit-frame-pointer
-	CFLAGS += -O2 -funroll-loops
-endif
 
 LDSOFLAGS += -lm $(LIBS)
 OBJS2 = base/grid.o base/flow_objects.o base/number.1.o base/number.2.o base/number.3.o base/number.4.o format/main.o

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri May 23 11:14:47 2008
@@ -241,7 +241,7 @@
 
 LOG.puts "-"*64
 
-$CFLAGS += " -xc++ -fno-operator-names -fno-omit-frame-pointer"
+$CFLAGS += " -xc++ -fno-operator-names"
 $CFLAGS += " -I/usr/X11R6/include"
 $C_INCLUDE_PATH.unshift "/usr/X11R6/include"
 
@@ -623,6 +623,7 @@
 	while log.length>0 do puts log.slice!(/^.{1,70} /) end
 end
 
+$debug=false
 while ARGV.length>0 do
 	arg=ARGV.shift
 	case arg
@@ -644,8 +645,8 @@
 		$conf[:LDSOFLAGS] << "-static"
 	when "--debug"
 		puts "Debug Mode (more error checking; less speed)"
+		$debug=true
 		$conf[:OPTIONS].push :HAVE_DEBUG
-		$CFLAGS += " -fno-inline"
 	when "--lite"
 		puts "Lite Mode (no float64, no int64)"
 		$conf[:OPTIONS].push :HAVE_LITE
@@ -663,6 +664,12 @@
 		$verbose=true
 	else puts "unknown option \"#{arg}\""; usage; exit 1
 	end
+end
+
+if $debug
+	$CFLAGS += " -O0 -fno-inline"
+else
+	$CFLAGS += " -O3"
 end
 
 #--------------------------------#
@@ -761,7 +768,6 @@
 puts Light
 
 $conf[:LDSOFLAGS].uniq!
-$CFLAGS += " -falign-functions=16" if $conf[:FEATURES][:gcc3]
 
 if not $conf[:FEATURES][:gcc3]
   puts "You should install gcc 3.x; gcc 2.9.x is no longer supported"



More information about the Gridflow-cvs mailing list