From 58843794cc3cad71049c9ef6469b672a1f449373 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Fri, 13 Nov 2020 15:23:19 +0300 Subject: [PATCH] disable gperftools lib --- thirdparty/build.sh | 14 +++++++------- vpc_scripts/source_exe_posix_base.vpc | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/thirdparty/build.sh b/thirdparty/build.sh index c27c7792..9f23a61a 100755 --- a/thirdparty/build.sh +++ b/thirdparty/build.sh @@ -28,9 +28,9 @@ mkdir -p ../lib/common/linux32 if [ "$1" = "clean" ] then - clean gperftools-2.0 +# clean gperftools-2.0 clean SDL2-src - clean protobuf-2.6.1 + clean protobuf-2.6.1/ clean StubSteamAPI/ clean openssl clean cryptopp @@ -41,11 +41,11 @@ then exit fi -cd gperftools-2.0 -conf ./configure CFLAGS="-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32" -mk -inst .libs/libtcmalloc_minimal.so.4 -cd ../ +#cd gperftools-2.0 +#conf ./configure CFLAGS="-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32" +#mk +#inst .libs/libtcmalloc_minimal.so.4 +#cd ../ cd SDL2-src conf ./configure --build=i686-pc-linux-gnu "CFLAGS=-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32" --enable-input-tslib=no diff --git a/vpc_scripts/source_exe_posix_base.vpc b/vpc_scripts/source_exe_posix_base.vpc index 23d7637d..26417730 100644 --- a/vpc_scripts/source_exe_posix_base.vpc +++ b/vpc_scripts/source_exe_posix_base.vpc @@ -33,11 +33,10 @@ $Configuration $OutputFile "$SRCDIR/../game/$OUTBINNAME" // In order to get the Valve standard allocator memory alignment (16-byte - // alignment for objects that are a multiple of 16 bytes) we use tcmalloc. // Using -l will ask the linker to use it, but if there are no references // to malloc/free then it may not actually use it. Wrapping the flag in the // as-needed controls forces it to be pulled in (from libtcmalloc_minimal.so). - $GCC_ExtraLinkerFlags "-Wl,--no-as-needed -ltcmalloc_minimal -Wl,--as-needed" [$LINUXALL&&!$DEDICATED] + $GCC_ExtraLinkerFlags "-Wl,--no-as-needed -Wl,--as-needed" [$LINUXALL&&!$DEDICATED] } } @@ -65,7 +64,6 @@ $Project $Folder "Link Libraries" [$LINUXALL&&!$DEDICATED] { - $File "$SRCDIR/thirdparty/gperftools-2.0/.libs/libtcmalloc_minimal.so" } }