Skip to content

Commit

Permalink
OpenTURNS changes
Browse files Browse the repository at this point in the history
- added Makefiles for mingw.
- updated to OpenTURNS v1.0.
The wrapper .dll generation now works.



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11888 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed May 10, 2012
1 parent 3454ba7 commit 3ad7dd3
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 211 deletions.
23 changes: 23 additions & 0 deletions SimulationRuntime/OpenTurns/Makefile.mingw
@@ -0,0 +1,23 @@
#
# Makefile
#

DEFINES=-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"ModelWrapper\" \
-DVERSION=\"0.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 \
-DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_PTHREAD_H=1

CFLAGS = -g -O2 -I. -Ic:/openturns/include/openturns -I/cluster/opt/mingw-3.4.5/opt/libxml2/include/libxml2 -I/cluster/opt/mingw-3.4.5/opt/regex/include
LDFLAGS = -L/c/mingw/lib -L/c/MinGW/lib -Lc:/openturns/lib/bin -L/cluster/opt/mingw-3.4.5/opt/libxml2/lib -L/cluster/opt/mingw-3.4.5/opt/regex/lib -L/c/openturns/bin /c/OpenTURNS/lib/openturns/libOT.dll.a -lOTbind-0 /c/mingw/lib/libxml2.dll.a /c/mingw/lib/libgnurx.dll.a /c/mingw/lib/libpthreadGC2.dll.a -Wl,--image-base=0x10000000 -Wl,--out-implib,ModelWrapper.dll.a
all: ModelWrapper.dll

read_matlab4.o : read_matlab4.c read_matlab4.h
gcc -o read_matlab4.o -c read_matlab4.c $(DEFINES) $(CFLAGS)

ModelWrapper.o: wrapper.c model_name.h wrapper_name.h
gcc -o ModelWrapper.o -c wrapper.c $(DEFINES) $(CFLAGS)

ModelWrapper.dll: ModelWrapper.o read_matlab4.o
gcc $(DEFINES) -shared ModelWrapper.o read_matlab4.o -o ModelWrapper.dll $(LDFLAGS)

clean:
rm -f ModelWrapper.o ModelWrapper.dll ModelWrapper.dll.a read_matlab4.o
3 changes: 2 additions & 1 deletion SimulationRuntime/OpenTurns/model_name.h
@@ -1 +1,2 @@
#define MODELNAME Model
#define MODELNAME Model
#define MODELNAMESTR "Model"

0 comments on commit 3ad7dd3

Please sign in to comment.