Mercurial > mxe-octave

view src/of-nurbs-1-fixes.patch @ 3903:385f5f4412b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-nurbs: fix cross compile, install libgomp's omp.h * src/of-nurbs.mk: make nurbs dependant on libgomp * src/of-nurbs-1-fixes.patch: update patch to use cross mkoctfile * src/libgomp.mk: update version to match gcc, install omp.h to HOST_INCDIR
author John Donoghue
date Tue, 14 Apr 2015 13:51:09 -0400
parents 1778bfc775d2
children
line wrap: on
line source

diff -ur nurbs.orig/src/Makefile nurbs/src/Makefile
--- nurbs.orig/src/Makefile	2015-04-14 13:19:10.283611864 -0400
+++ nurbs/src/Makefile	2015-04-14 13:21:10.137011941 -0400
@@ -2,13 +2,15 @@
 curvederivcpts.oct nrb_srf_basisfun_der__.oct surfderiveval.oct bspderiv.oct \
 nrbsurfderiveval.oct tbasisfun.oct
 
+MKOCTFILE ?= mkoctfile
+
 all: $(OCTFILES)
 
 low_level_functions.o: low_level_functions.cc
-	mkoctfile -c $<
+	$(MKOCTFILE) -c $<
 
 %.oct:  %.cc low_level_functions.o
-	mkoctfile $< low_level_functions.o
+	$(MKOCTFILE) $< low_level_functions.o
 
 clean:
 	-rm -f *.o core octave-core *.oct *~
diff -ur nurbs.orig/src/nrbsurfderiveval.cc nurbs/src/nrbsurfderiveval.cc
--- nurbs.orig/src/nrbsurfderiveval.cc	2015-04-14 13:19:10.283611864 -0400
+++ nurbs/src/nrbsurfderiveval.cc	2015-04-14 13:19:47.273352588 -0400
@@ -120,7 +120,7 @@
       
       Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':'));	 
       idx (0) = idx_vector (3);
-      Matrix weights (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
+      Matrix weights (NDArray (coefs.index (idx).squeeze ()));
 
       for (octave_idx_type iu(0); iu<uv.cols (); iu++)
 	{
@@ -132,7 +132,7 @@
 	    {
 
 	      Matrix Aders; idx(0) = idx_vector (idim);
-	      Matrix P (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
+	      Matrix P (NDArray (coefs.index (idx).squeeze ()));
 	      surfderiveval (n, p, knotsu, m, q, knotsv, P, uv(0,iu), uv(1,iu), d, Aders);;      
 	      
 	      for (octave_idx_type k(0); k<=d; k++)