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

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Thu Oct 15 15:44:24 EDT 2009


Author: matju
Date: Thu Oct 15 15:44:21 2009
New Revision: 4210

Log:
test for CPLUS_INCLUDE_PATH hack for OSX

Modified:
    trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Oct 15 15:44:21 2009
@@ -2,7 +2,7 @@
 # $Id$
 
 include config.make
-COMMON_DEPS = config.make Makefile base/source_filter.rb
+# COMMON_DEPS = config.make Makefile base/source_filter.rb
 RUBY = ruby
 
 #--------#
@@ -32,6 +32,12 @@
 endif
 PD_LIB = gridflow$(PDSUF)
 
+ifeq ($(CPLUS_INCLUDE_PATH),)
+  SNAFU =
+else
+  SNAFU = $(subst :, -I,:$(CPLUS_INCLUDE_PATH))
+endif
+
 all:: $(PD_LIB) deprecated
 
 .SUFFIXES:
@@ -55,7 +61,7 @@
 %.4.o: %.c.fcs $(COMMON_DEPS) $(H)
 	$(CXX) $(CFLAGS) -DPASS4 -c $< -o $@
 %.o: %.m.fcs $(COMMON_DEPS) $(H)
-	$(CXX) $(CFLAGS) -xobjective-c++ -c $< -o $@
+	$(CXX) $(CFLAGS) $(SNAFU) -xobjective-c++ -c $< -o $@
 
 %.s: %.c.fcs $(COMMON_DEPS) $(H)
 	$(CXX) $(CFLAGS) -S $< -o $@



More information about the Gridflow-cvs mailing list