This repository was archived by the owner on May 18, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +27
-6
lines changed Expand file tree Collapse file tree 6 files changed +27
-6
lines changed Original file line number Diff line number Diff line change @@ -225,13 +225,9 @@ $(RESULTSOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp $(RESULTSFILESPATH) $(COMMON_
225225 $(MKBUILDDIR)
226226 $(CXX) -c $(CXXFLAGS) -o $@ $<
227227
228- $(SIMOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp linearization/linearize.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
228+ $(SIMOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp linearization/linearize.cpp dataReconciliation/dataReconciliation.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
229229 $(MKBUILDDIR)
230- $(CXX) -c -Ilinearization/ $(CXXFLAGS) -o $@ $<
231-
232- $(SIMOBJSPATH):$(BUILDPATH)/%$(OBJ_EXT): %.cpp dataReconciliation/dataReconciliation.cpp $(SIMHFILESPATH) $(COMMON_HEADERS)
233- $(MKBUILDDIR)
234- $(CXX) -c -IdataReconciliation/ $(CXXFLAGS) -o $@ $<
230+ $(CXX) -c -Ilinearization/ -IdataReconciliation/ $(CXXFLAGS) -o $@ $<
235231
236232$(SIMOBJSPATHC):$(BUILDPATH)/%$(OBJ_EXT): %.c $(SIMHFILESPATH) $(COMMON_HEADERS)
237233 @echo Deps: $(SIMHFILESPATH) $(COMMON_HEADERS)
Original file line number Diff line number Diff line change 5656
5757#ifdef WITH_SUNDIALS
5858
59+ /* adrpo: on mingw link with static sundials */
60+ #if defined(__MINGW32__ )
61+ #define LINK_SUNDIALS_STATIC
62+ #endif
63+
5964/* readability */
6065#define SCALE_MODE 0
6166#define RESCALE_MODE 1
Original file line number Diff line number Diff line change 4141
4242#ifdef WITH_SUNDIALS
4343
44+ /* adrpo: on mingw link with static sundials */
45+ #if defined(__MINGW32__ )
46+ #define LINK_SUNDIALS_STATIC
47+ #endif
48+
4449#include <sundials/sundials_nvector.h>
4550#include <nvector/nvector_serial.h>
4651#include <idas/idas.h>
Original file line number Diff line number Diff line change 4141
4242#ifdef WITH_SUNDIALS
4343
44+ /* adrpo: on mingw link with static sundials */
45+ #if defined(__MINGW32__ )
46+ #define LINK_SUNDIALS_STATIC
47+ #endif
48+
4449#include <math.h>
4550#include <stdlib.h>
4651#include <string.h> /* memcpy */
Original file line number Diff line number Diff line change 4444#include "simulation/options.h"
4545#ifdef WITH_SUNDIALS
4646
47+ /* adrpo: on mingw link with static sundials */
48+ #if defined(__MINGW32__ )
49+ #define LINK_SUNDIALS_STATIC
50+ #endif
51+
4752#include <kinsol/kinsol.h>
4853#include <kinsol/kinsol_dense.h>
4954#include <kinsol/kinsol_spgmr.h>
Original file line number Diff line number Diff line change 4141
4242#ifdef WITH_SUNDIALS
4343
44+ /* adrpo: on mingw link with static sundials */
45+ #if defined(__MINGW32__ )
46+ #define LINK_SUNDIALS_STATIC
47+ #endif
48+
4449 #define DEFAULT_IMPRK_ORDER 5
4550
4651 #include <math.h>
You can’t perform that action at this time.
0 commit comments