|
 |
720d0e7 |
diff -ur tbb-2.0r014/build/Makefile.tbb tbb-2.0r014.test/build/Makefile.tbb
|
|
|
720d0e7 |
--- tbb-2.0r014/build/Makefile.tbb 2007-09-21 21:16:34.000000000 -0400
|
|
|
720d0e7 |
+++ tbb-2.0r014.test/build/Makefile.tbb 2007-12-15 17:28:09.000000000 -0500
|
|
|
720d0e7 |
@@ -74,9 +74,12 @@
|
|
|
720d0e7 |
|
|
|
720d0e7 |
# Object files that gmake up TBB (TBB_ASM.OBJ is platform-specific)
|
|
|
720d0e7 |
TBB.OBJ = $(TBB_CPLUS.OBJ) $(TBB_ASM.OBJ)
|
|
|
720d0e7 |
+LIB_LINK_FLAGS += -Wl,-soname=$(TBB.DLL).$(SONAME_SUFFIX)
|
|
|
720d0e7 |
|
|
|
720d0e7 |
$(TBB.DLL): $(TBB.OBJ) $(TBB.DEF) $(TBB.RES) tbbvars
|
|
|
720d0e7 |
- $(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL) $(LIB_LINK_FLAGS)
|
|
|
720d0e7 |
+ $(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL).$(VERSION) $(LIB_LINK_FLAGS)
|
|
|
720d0e7 |
+ ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL).$(SONAME_SUFFIX)
|
|
|
720d0e7 |
+ ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL)
|
|
|
720d0e7 |
|
|
|
720d0e7 |
|
|
|
720d0e7 |
#clean:
|
|
|
720d0e7 |
diff -ur tbb-2.0r014/build/Makefile.tbbmalloc tbb-2.0r014.test/build/Makefile.tbbmalloc
|
|
|
720d0e7 |
--- tbb-2.0r014/build/Makefile.tbbmalloc 2007-09-21 21:16:34.000000000 -0400
|
|
|
720d0e7 |
+++ tbb-2.0r014.test/build/Makefile.tbbmalloc 2007-12-15 17:28:32.000000000 -0500
|
|
|
720d0e7 |
@@ -58,6 +58,7 @@
|
|
|
720d0e7 |
# MALLOC_CPLUS.OBJ is built in two steps due to Intel Compiler Tracker # C69574
|
|
|
720d0e7 |
MALLOC.OBJ := $(MALLOC_CPLUS.OBJ) $(MALLOC_ASM.OBJ) $(MALLOC_CUSTOM.OBJ) MemoryAllocator.$(OBJ)
|
|
|
720d0e7 |
MALLOC_CPLUS.OBJ += MemoryAllocator.$(OBJ)
|
|
|
720d0e7 |
+LIB_LINK_FLAGS += -Wl,-soname=$(MALLOC.DLL).$(SONAME_SUFFIX)
|
|
|
720d0e7 |
M_CPLUS_FLAGS := $(subst $(WARNING_KEY),,$(M_CPLUS_FLAGS))
|
|
|
720d0e7 |
|
|
|
720d0e7 |
$(MALLOC_CPLUS.OBJ): %.$(OBJ): %.cpp
|
|
|
720d0e7 |
@@ -69,7 +70,9 @@
|
|
|
720d0e7 |
|
|
|
720d0e7 |
$(MALLOC.DLL): TBB.DEF=$(MALLOC.DEF)
|
|
|
720d0e7 |
$(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.DEF) $(TBBMALLOC.RES)
|
|
|
720d0e7 |
- $(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL) $(LIB_LINK_FLAGS)
|
|
|
720d0e7 |
+ $(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL).$(VERSION) $(LIB_LINK_FLAGS)
|
|
|
720d0e7 |
+ ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL).$(SONAME_SUFFIX)
|
|
|
720d0e7 |
+ ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL)
|
|
|
720d0e7 |
|
|
|
720d0e7 |
malloc: $(MALLOC.DLL)
|
|
|
720d0e7 |
|
|
|
720d0e7 |
diff -ur tbb-2.0r014/build/common.inc tbb-2.0r014.test/build/common.inc
|
|
|
720d0e7 |
--- tbb-2.0r014/build/common.inc 2007-09-21 21:16:34.000000000 -0400
|
|
|
720d0e7 |
+++ tbb-2.0r014.test/build/common.inc 2007-12-15 16:43:10.000000000 -0500
|
|
|
720d0e7 |
@@ -24,6 +24,9 @@
|
|
|
720d0e7 |
# invalidate any other reasons why the executable file might be covered by
|
|
|
720d0e7 |
# the GNU General Public License.
|
|
|
720d0e7 |
|
|
|
720d0e7 |
+VERSION=2.0.014
|
|
|
720d0e7 |
+SONAME_SUFFIX=2
|
|
|
720d0e7 |
+
|
|
|
720d0e7 |
ifndef tbb_os
|
|
|
720d0e7 |
ifeq ($(OS), Windows_NT)
|
|
|
720d0e7 |
export tbb_os=windows
|