[cantera]: few edits to get everything working
This commit is contained in:
parent
79dc264134
commit
4915b3e9c4
6 changed files with 117 additions and 4 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: $
|
||||
|
||||
# will need to add python and matlab
|
||||
SUBDIRS = src user cxx ext
|
||||
SUBDIRS = ext src user cxx
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ cc_sources = abort_.c c_log.c d_atn2.c dfe.c d_prod.c \
|
|||
|
||||
# arithchk.c getarg_.c iargc_.c
|
||||
|
||||
h_sources = f2c.h fio.h fmt.h fp.h lio.h rawio.h sysdep1.h
|
||||
h_sources = f2c.h sysdep1.h fio.h fmt.h fp.h lio.h rawio.h
|
||||
|
||||
AM_CPPFLAGS = -I.
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
|
@ -57,7 +57,6 @@ all:
|
|||
cp -u signal1.h0 signal1.h
|
||||
cp $(h_sources) $(top_builddir)/build/include/
|
||||
|
||||
|
||||
__top_builddir__build_lib_libctf2c_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
|
||||
__top_builddir__build_lib_libctf2c_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
|
|
|
|||
35
Cantera/ext/f2c_libs/signal1.h
Normal file
35
Cantera/ext/f2c_libs/signal1.h
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/* You may need to adjust the definition of signal1 to supply a */
|
||||
/* cast to the correct argument type. This detail is system- and */
|
||||
/* compiler-dependent. The #define below assumes signal.h declares */
|
||||
/* type SIG_PF for the signal function's second argument. */
|
||||
|
||||
/* For some C++ compilers, "#define Sigarg_t ..." may be appropriate. */
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#ifndef Sigret_t
|
||||
#define Sigret_t void
|
||||
#endif
|
||||
#ifndef Sigarg_t
|
||||
#ifdef KR_headers
|
||||
#define Sigarg_t
|
||||
#else
|
||||
#define Sigarg_t int
|
||||
#endif
|
||||
#endif /*Sigarg_t*/
|
||||
|
||||
#ifdef USE_SIG_PF /* compile with -DUSE_SIG_PF under IRIX */
|
||||
#define sig_pf SIG_PF
|
||||
#else
|
||||
typedef Sigret_t (*sig_pf)(Sigarg_t);
|
||||
#endif
|
||||
|
||||
#define signal1(a,b) signal(a,(sig_pf)b)
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define Sigarg ...
|
||||
#define Use_Sigarg
|
||||
#else
|
||||
#define Sigarg Int n
|
||||
#define Use_Sigarg n = n /* shut up compiler warning */
|
||||
#endif
|
||||
78
Cantera/ext/f2c_libs/sysdep1.h
Normal file
78
Cantera/ext/f2c_libs/sysdep1.h
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
#ifndef SYSDEP_H_INCLUDED
|
||||
#define SYSDEP_H_INCLUDED
|
||||
#undef USE_LARGEFILE
|
||||
#ifndef NO_LONG_LONG
|
||||
|
||||
#ifdef __sun__
|
||||
#define USE_LARGEFILE
|
||||
#define OFF_T off64_t
|
||||
// On some older solaris systems, it seems that OFF_T needed to
|
||||
// be set to an int sometimes. It didn't cause crashes if you
|
||||
// didn't. However, ld warnings would occur if the sys -lg2c
|
||||
// libs were loaded at the same time.
|
||||
// see man pages for fseek and fseeko.
|
||||
// Can be debugged by finding out what off_t is set to in the
|
||||
// the standard compiler headings.
|
||||
//#define OFF_T int
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
#define USE_LARGEFILE
|
||||
#define OFF_T __off64_t
|
||||
#endif
|
||||
|
||||
#ifdef _AIX43
|
||||
#define _LARGE_FILES
|
||||
#define _LARGE_FILE_API
|
||||
#define USE_LARGEFILE
|
||||
#endif /*_AIX43*/
|
||||
|
||||
#ifdef __hpux
|
||||
#define _FILE64
|
||||
#define _LARGEFILE64_SOURCE
|
||||
#define USE_LARGEFILE
|
||||
#endif /*__hpux*/
|
||||
|
||||
#ifdef __sgi
|
||||
#define USE_LARGEFILE
|
||||
#endif /*__sgi*/
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
#define OFF_T off_t
|
||||
#define FSEEK fseeko
|
||||
#define FTELL ftello
|
||||
#endif
|
||||
|
||||
#ifdef USE_LARGEFILE
|
||||
#ifndef OFF_T
|
||||
#define OFF_T off64_t
|
||||
#endif
|
||||
#ifndef _LARGEFILE_SOURCE
|
||||
#define _LARGEFILE_SOURCE
|
||||
#endif
|
||||
#ifndef _LARGEFILE64_SOURCE
|
||||
#define _LARGEFILE64_SOURCE
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#define FOPEN fopen64
|
||||
#define FREOPEN freopen64
|
||||
#define FSEEK fseeko64
|
||||
#define FSTAT fstat64
|
||||
#define FTELL ftello64
|
||||
#define FTRUNCATE ftruncate64
|
||||
#define STAT stat64
|
||||
#define STAT_ST stat64
|
||||
#endif /*USE_LARGEFILE*/
|
||||
#endif /*NO_LONG_LONG*/
|
||||
|
||||
#ifndef NON_UNIX_STDIO
|
||||
#ifndef USE_LARGEFILE
|
||||
#define _INCLUDE_POSIX_SOURCE /* for HP-UX */
|
||||
#define _INCLUDE_XOPEN_SOURCE /* for HP-UX */
|
||||
#include "sys/types.h"
|
||||
#include "sys/stat.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /*SYSDEP_H_INCLUDED*/
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# $Id: $
|
||||
|
||||
# will need to add python and matlab
|
||||
SUBDIRS = numerics base converters thermo transport oneD zeroD kinetics spectra equil
|
||||
SUBDIRS = base numerics converters thermo transport oneD zeroD kinetics spectra equil
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ __top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources)
|
|||
# header file accumulation -- only copy if file updated!
|
||||
all:
|
||||
@echo copying headers $<
|
||||
mkdir $(top_builddir)/build/include/
|
||||
cp -u *.h $(top_builddir)/build/include/
|
||||
|
||||
CLEANFILES = *.o
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue