[Gridflow-cvs] [svn] commit: r3643 - /trunk/Makefile

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Apr 25 11:03:01 EDT 2008


Author: matju
Date: Fri Apr 25 11:03:01 2008
New Revision: 3643

Log:
merged base/main.c into gridflow.c

Modified:
    trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Apr 25 11:03:01 2008
@@ -21,10 +21,8 @@
 	CFLAGS += -O2 -funroll-loops
 endif
 
-LDSOFLAGS += -lm
-BRIDGE_LDFLAGS += -lm $(LIBS)
-OBJS2 = base/main.o 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
+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
 SYSTEM = $(shell uname -s | sed -e 's/^MINGW.*/NT/')
 FILT = $(RUBY) -w base/source_filter.rb
 ifeq ($(OS),darwin)
@@ -86,7 +84,7 @@
 	find . -mtime -0 -ls -exec touch '{}' ';'
 
 $(PD_LIB): gridflow.c.fcs $(OBJS2) $(OBJS) $(H) $(COMMON_DEPS)
-	$(CXX) -DPDSUF=\"$(PDSUF)\" -Ibundled/pd $(LDSOFLAGS) $(BRIDGE_LDFLAGS) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) \
+	$(CXX) -DPDSUF=\"$(PDSUF)\" -Ibundled/pd $(LDSOFLAGS) $(CFLAGS) $(PDBUNDLEFLAGS) $(LIBPATH) \
 		gridflow.c.fcs -xnone $(OBJS2) $(OBJS) -o $@
 
 beep::



More information about the Gridflow-cvs mailing list