From 64baf661f5e2af6f74e17dd42c7e7adc821724df Mon Sep 17 00:00:00 2001 From: Ambal Date: Sun, 1 Nov 2009 13:47:22 +0200 Subject: [PATCH] [8759] Fix for Intel TBB library aka 'Cannot open "../../dep/tbb/libtbbmalloc.so"'. Thanks to ApoC, ghostpast and me :P Signed-off-by: Ambal --- src/mangosd/Makefile.am | 5 ++--- src/realmd/Makefile.am | 5 ++--- src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mangosd/Makefile.am b/src/mangosd/Makefile.am index 608d0a1ba..3fd406888 100644 --- a/src/mangosd/Makefile.am +++ b/src/mangosd/Makefile.am @@ -43,10 +43,9 @@ mangos_worldd_LDADD = \ ../shared/vmap/libmangosvmaps.a \ ../framework/libmangosframework.a \ ../../dep/src/sockets/libmangossockets.a \ - ../../dep/src/g3dlite/libg3dlite.a \ - ../../dep/tbb/libtbbmalloc.so + ../../dep/src/g3dlite/libg3dlite.a -mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L../../dep/tbb -L$(libdir) $(MANGOS_LIBS) -export-dynamic +mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic ## Additional files to include when running 'make dist' # Include world daemon configuration diff --git a/src/realmd/Makefile.am b/src/realmd/Makefile.am index 4969c4082..6aa09c392 100644 --- a/src/realmd/Makefile.am +++ b/src/realmd/Makefile.am @@ -36,10 +36,9 @@ mangos_realmd_LDADD = \ ../shared/Auth/libmangosauth.a \ ../shared/libmangosshared.a \ ../framework/libmangosframework.a \ - ../../dep/src/sockets/libmangossockets.a \ - ../../dep/tbb/libtbbmalloc.so + ../../dep/src/sockets/libmangossockets.a -mangos_realmd_LDFLAGS = -L../../dep/src/sockets -L../../dep/tbb -L$(libdir) $(MANGOS_LIBS) +mangos_realmd_LDFLAGS = -L../../dep/src/sockets -L$(libdir) $(MANGOS_LIBS) ## Additional files to include when running 'make dist' # Include realm list daemon configuration diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 62069c479..d24bbb19e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8758" + #define REVISION_NR "8759" #endif // __REVISION_NR_H__