[cantera]: relocating, saving progress
This commit is contained in:
parent
020a18fa07
commit
8eb439f294
3 changed files with 5 additions and 18 deletions
|
|
@ -10,13 +10,13 @@ LINK += -lctbase -ltpx -lctmath -lconverters
|
|||
LINK += -luser -lcvode -lstdc++ -lctlapack
|
||||
LINK += -lctblas -lctf2c -lctcxx
|
||||
|
||||
LIBS = -L$(top_builddir)/build/lib/ $(LINK)
|
||||
|
||||
AM_CPPFLAGS = -I../base -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
|
||||
#LIBS = -L$(top_builddir)/build/lib/ $(LINK)
|
||||
LIBS = -L/workspace/src/cantera/pecos_autotools/build/lib/ $(LINK)
|
||||
AM_CPPFLAGS = -I. -I/workspace/src/cantera/pecos_autotools/build/include/
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
bin_PROGRAMS = cxx_examples
|
||||
library_includedir = $(includedir)
|
||||
library_includedir = $(includedir) -I/workspace/src/cantera/pecos_autotools/build/include/
|
||||
|
||||
#-----------------------
|
||||
# Cantera cxx examples
|
||||
|
|
|
|||
|
|
@ -1,14 +1,7 @@
|
|||
|
||||
#include <Cantera.h>
|
||||
#include <cantera/Cantera.h>
|
||||
using namespace Cantera;
|
||||
using namespace std;
|
||||
|
||||
// turn off warnings under Windows
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable:4786)
|
||||
#pragma warning(disable:4503)
|
||||
#endif
|
||||
|
||||
#define NUM_EXAMPLES 6
|
||||
|
||||
int kinetics_example1(int job);
|
||||
|
|
|
|||
|
|
@ -10,12 +10,6 @@
|
|||
//
|
||||
/////////////////////////////////////////////////////////////
|
||||
|
||||
// turn off warnings under Windows
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable:4786)
|
||||
#pragma warning(disable:4503)
|
||||
#endif
|
||||
|
||||
#include <cantera/Cantera.h>
|
||||
#include <cantera/zerodim.h>
|
||||
#include <cantera/IdealGasMix.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue