diff options
author | 2016-11-11 20:03:11 (GMT) | |
---|---|---|
committer | 2016-11-11 20:03:11 (GMT) | |
commit | 0d17d26005efbd5d6157df0f68a26c738c385ed2 (patch) | |
tree | 9c25ccb481bd4b58e54c692403d9c49402f09d98 /patches/duma/2_5_12/110-separate_cpp.patch | |
parent | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (diff) | |
parent | 5ebbb52be04e42bbd1c28b903eba642bebaeb1b6 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'patches/duma/2_5_12/110-separate_cpp.patch')
-rw-r--r-- | patches/duma/2_5_12/110-separate_cpp.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/patches/duma/2_5_12/110-separate_cpp.patch b/patches/duma/2_5_12/110-separate_cpp.patch deleted file mode 100644 index df2d377..0000000 --- a/patches/duma/2_5_12/110-separate_cpp.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile ---- duma_2_5_12.orig/Makefile 2007-09-07 21:57:45.000000000 +0200 -+++ duma_2_5_12/Makefile 2007-09-07 21:58:35.000000000 +0200 -@@ -231,9 +231,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) - @ $(ECHOLF) |