diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-06-17 22:28:17 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-06-17 22:28:17 (GMT) |
| commit | 1b822b4447ce4cf557398bc4a264b575636015af (patch) | |
| tree | 8d9417188fcdc7d25075a585307fcc60cd8490bd /patches/duma/2_5_14/200-separate_cpp.patch | |
| parent | b9640aeaab27bd4d5cbf1f5eb63c560b6d626677 (diff) | |
Introduce latest D.U.M.A. version and associated patches rediffed.
/trunk/patches/duma/2_5_14/200-separate_cpp.patch | 19 19 0 0 +++++++++++++++++
/trunk/patches/duma/2_5_14/100-cross-compile.patch | 32 32 0 0 ++++++++++++++++++++++++++++
/trunk/config/debug/duma.in | 5 5 0 0 ++++
3 files changed, 56 insertions(+)
Diffstat (limited to 'patches/duma/2_5_14/200-separate_cpp.patch')
| -rw-r--r-- | patches/duma/2_5_14/200-separate_cpp.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/duma/2_5_14/200-separate_cpp.patch b/patches/duma/2_5_14/200-separate_cpp.patch new file mode 100644 index 0000000..bc287c4 --- /dev/null +++ b/patches/duma/2_5_14/200-separate_cpp.patch @@ -0,0 +1,19 @@ +diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile +--- duma_2_5_14.orig/Makefile 2008-06-17 10:30:40.000000000 +0200 ++++ duma_2_5_14/Makefile 2008-06-17 10:30:17.000000000 +0200 +@@ -228,9 +228,13 @@ + dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \ + createconf.c + +-OBJECTS = dumapp.o duma.o sem_inc.o print.o ++OBJECTS = duma.o sem_inc.o print.o ++SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o + +-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o ++ifeq ($(DUMA_CPP),1) ++OBJECTS += dumapp.o ++SO_OBJECTS += dumapp_so.o ++endif + + all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) + |