diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am index 7645bc55e..5a4efd9a0 100644 --- a/examples/cxx/Makefile.am +++ b/examples/cxx/Makefile.am @@ -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 diff --git a/examples/cxx/examples.cpp b/examples/cxx/examples.cpp index 4ca4ffa8b..70602a928 100755 --- a/examples/cxx/examples.cpp +++ b/examples/cxx/examples.cpp @@ -1,14 +1,7 @@ - -#include +#include 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); diff --git a/examples/cxx/kinetics_example1.cpp b/examples/cxx/kinetics_example1.cpp index 74500c287..a56a82754 100755 --- a/examples/cxx/kinetics_example1.cpp +++ b/examples/cxx/kinetics_example1.cpp @@ -10,12 +10,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include