From 9cfcabfc4c1f2b0556ee0950e5f8987cc4f9fe4c Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 10 Sep 2012 16:02:30 +0000 Subject: [PATCH] disable all demos for premake4 iOS build (it only compiles HelloWorld, Benchmark and UnitTest for now) add btAlignedFree to deleteCriticalSection --- build/premake4.lua | 2 ++ src/BulletMultiThreaded/Win32ThreadSupport.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/build/premake4.lua b/build/premake4.lua index 194fefa70..6436d8035 100644 --- a/build/premake4.lua +++ b/build/premake4.lua @@ -166,7 +166,9 @@ end end if not _OPTIONS["without-demos"] then + if not _OPTIONS["ios"] then include "../Demos" + end include "../Extras" end diff --git a/src/BulletMultiThreaded/Win32ThreadSupport.cpp b/src/BulletMultiThreaded/Win32ThreadSupport.cpp index 77d949b88..ae224b59e 100644 --- a/src/BulletMultiThreaded/Win32ThreadSupport.cpp +++ b/src/BulletMultiThreaded/Win32ThreadSupport.cpp @@ -449,6 +449,7 @@ void Win32ThreadSupport::deleteBarrier(btBarrier* barrier) void Win32ThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection) { criticalSection->~btCriticalSection(); + btAlignedFree(criticalSection); }