mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-04 14:04:32 +00:00 
			
		
		
		
	first working version for the new build system
This commit is contained in:
		
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -1,5 +1,4 @@
 | 
			
		||||
# additional include paths necessary to compile the C++ library
 | 
			
		||||
AM_CXXFLAGS = -I$(top_srcdir)/include/
 | 
			
		||||
 | 
			
		||||
extra_sources=
 | 
			
		||||
if BUILD_COMMS_MPI
 | 
			
		||||
@@ -20,16 +19,8 @@ endif
 | 
			
		||||
include Make.inc
 | 
			
		||||
include Eigen.inc
 | 
			
		||||
 | 
			
		||||
lib_LIBRARIES = libGrid.a
 | 
			
		||||
 | 
			
		||||
libGrid_a_SOURCES = $(CCFILES) $(extra_sources)
 | 
			
		||||
 | 
			
		||||
fftwdir = $(prefix)/lib/
 | 
			
		||||
fftw_DATA = libfftw3.a
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
# Include files
 | 
			
		||||
#
 | 
			
		||||
otherincludedir = $(includedir)/Grid
 | 
			
		||||
nobase_otherinclude_HEADERS =$(HFILES) $(EFILES) fftw3.h Config.h
 | 
			
		||||
lib_LTLIBRARIES = libGrid.la
 | 
			
		||||
 | 
			
		||||
libGrid_la_SOURCES             = $(CCFILES) $(extra_sources)
 | 
			
		||||
libGrid_ladir                  = $(pkgincludedir)
 | 
			
		||||
nobase_dist_pkginclude_HEADERS = $(HFILES) $(eigen_files) Config.h
 | 
			
		||||
 
 | 
			
		||||
@@ -18,10 +18,10 @@
 | 
			
		||||
#include <stddef.h>
 | 
			
		||||
#include <Config.h>
 | 
			
		||||
 | 
			
		||||
#ifdef HAVE_GMP_H
 | 
			
		||||
#ifdef HAVE_LIBGMP
 | 
			
		||||
#include "bigfloat.h"
 | 
			
		||||
#else
 | 
			
		||||
#include "algorithms/approx/bigfloat_double.h"
 | 
			
		||||
#include "bigfloat_double.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define JMAX 10000 //Maximum number of iterations of Newton's approximation
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@ directory
 | 
			
		||||
#ifndef GRID_VECTOR_TYPES
 | 
			
		||||
#define GRID_VECTOR_TYPES
 | 
			
		||||
 | 
			
		||||
#ifdef EMPTY_SIMD
 | 
			
		||||
#ifdef GENERIC_VEC
 | 
			
		||||
#include "Grid_empty.h"
 | 
			
		||||
#endif
 | 
			
		||||
#ifdef SSE4
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user