diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 5ef2b8a039..624ae7a339 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -780,8 +780,6 @@ if (COMPILER == "MSVC"): LibName("BULLET", GetThirdpartyDir() + "bullet/lib/BulletSoftBody" + suffix) if (COMPILER=="GCC"): - PkgDisable("MIMALLOC") # no discernable benefit over glibc - if GetTarget() != "darwin": PkgDisable("COCOA") @@ -855,6 +853,7 @@ if (COMPILER=="GCC"): SmartPkgEnable("OPUS", "opusfile", ("opusfile", "opus", "ogg"), ("ogg/ogg.h", "opus/opusfile.h", "opus")) SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h") SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config") + SmartPkgEnable("MIMALLOC", "", ("mimalloc"), "mimalloc.h") # Copy freetype libraries to be specified after harfbuzz libraries as well, # because there's a circular dependency between the two libraries. @@ -924,6 +923,9 @@ if (COMPILER=="GCC"): LibName("ARTOOLKIT", "-Wl,--exclude-libs,libAR.a") LibName("ARTOOLKIT", "-Wl,--exclude-libs,libARMulti.a") + if not PkgSkip("MIMALLOC"): + LibName("MIMALLOC", "-Wl,--exclude-libs,libmimalloc.a") + if PkgSkip("FFMPEG") or GetTarget() == "darwin": cv_lib = ChooseLib(("opencv_core", "cv"), "OPENCV") if cv_lib == "opencv_core":