disable gperftools lib

This commit is contained in:
nillerusr 2020-11-13 15:23:19 +03:00
parent cbe073d167
commit 58843794cc
2 changed files with 8 additions and 10 deletions

14
thirdparty/build.sh vendored
View File

@ -28,9 +28,9 @@ mkdir -p ../lib/common/linux32
if [ "$1" = "clean" ] if [ "$1" = "clean" ]
then then
clean gperftools-2.0 # clean gperftools-2.0
clean SDL2-src clean SDL2-src
clean protobuf-2.6.1 clean protobuf-2.6.1/
clean StubSteamAPI/ clean StubSteamAPI/
clean openssl clean openssl
clean cryptopp clean cryptopp
@ -41,11 +41,11 @@ then
exit exit
fi fi
cd gperftools-2.0 #cd gperftools-2.0
conf ./configure CFLAGS="-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32" #conf ./configure CFLAGS="-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32"
mk #mk
inst .libs/libtcmalloc_minimal.so.4 #inst .libs/libtcmalloc_minimal.so.4
cd ../ #cd ../
cd SDL2-src 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 conf ./configure --build=i686-pc-linux-gnu "CFLAGS=-m32 -Wno-narrowing" "CXXFLAGS=-m32 -Wno-narrowing -fpermissive" "LDFLAGS=-m32" --enable-input-tslib=no

View File

@ -33,11 +33,10 @@ $Configuration
$OutputFile "$SRCDIR/../game/$OUTBINNAME" $OutputFile "$SRCDIR/../game/$OUTBINNAME"
// In order to get the Valve standard allocator memory alignment (16-byte // 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 // 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 // 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). // 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] $Folder "Link Libraries" [$LINUXALL&&!$DEDICATED]
{ {
$File "$SRCDIR/thirdparty/gperftools-2.0/.libs/libtcmalloc_minimal.so"
} }
} }