[GRASS-SVN] r70983 - grass-addons/grass7/raster/r.sun.mp

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2017-04-28 14:06:10 -0700 (Fri, 28 Apr 2017)
New Revision: 70983

Modified:
   grass-addons/grass7/raster/r.sun.mp/Makefile
   grass-addons/grass7/raster/r.sun.mp/main.c
Log:
r.sun.mp: include and link gmath (implicit decl of G_alloc_fmatrix) and use G vars for OpenMP

Modified: grass-addons/grass7/raster/r.sun.mp/Makefile
===================================================================
--- grass-addons/grass7/raster/r.sun.mp/Makefile	2017-04-28 15:05:23 UTC (rev 70982)
+++ grass-addons/grass7/raster/r.sun.mp/Makefile	2017-04-28 21:06:10 UTC (rev 70983)
@@ -2,10 +2,10 @@
 
 PGM = r.sun.mp
 
-LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
-DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(GMATHLIB) $(PROJLIB) $(OMPLIB)
+DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP) $(GMATHDEP)
 EXTRA_INC = $(PROJINC) $(OCLINCPATH)
-EXTRA_CFLAGS=-fopenmp
+EXTRA_CFLAGS = $(OMPCFLAGS)
 EXTRA_LIBS = $(OCLLIB) $(GISLIB) -lgomp $(MATHLIB)
 #needed?  LIBES += $(OCLLIBPATH)  or  EXTRA_LDFLAGS = $(OCLLIBPATH)
 

Modified: grass-addons/grass7/raster/r.sun.mp/main.c
===================================================================
--- grass-addons/grass7/raster/r.sun.mp/main.c	2017-04-28 15:05:23 UTC (rev 70982)
+++ grass-addons/grass7/raster/r.sun.mp/main.c	2017-04-28 21:06:10 UTC (rev 70983)
@@ -54,6 +54,7 @@
 #include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
+#include <grass/gmath.h>
 #include "sunradstruct.h"
 #include "local_proto.h"
 #include "rsunglobals.h"