From d4038c1ad92d5bb69fce12df65c3b82b48b30e0f Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Mon, 26 Aug 2013 22:25:36 +0200
Subject: [PATCH 1/2] Fix build on Linux/OSX

---
 BBGE/MemoryAllocatorSmallBlock.cpp | 11 +++++++++--
 CMakeLists.txt                     |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/BBGE/MemoryAllocatorSmallBlock.cpp b/BBGE/MemoryAllocatorSmallBlock.cpp
index 62b523f..c51f964 100644
--- a/BBGE/MemoryAllocatorSmallBlock.cpp
+++ b/BBGE/MemoryAllocatorSmallBlock.cpp
@@ -7,11 +7,18 @@
 #include "MemoryAllocatorSmallBlock.h"
 #include "bithacks.h"
 
-//#define DD(...) logdev(__VA_ARGS__)
+#include <assert.h>
+
+//#define DD(...) fprintf(stderr, __VA_ARGS__)
 #define DD(...)
 #define logdev(...)
 #define logerror(...)
-#define ASSERT(x) assert(x)
+
+#ifdef NDEBUG
+# define ASSERT(x)
+#else
+# define ASSERT(x) assert(x)
+#endif
 
 
 SmallBlockAllocator::SmallBlockAllocator(unsigned int blockSizeMin,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bb2171..1990d5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,6 +448,7 @@ SET(BBGE_SRCS
     ${BBGEDIR}/LensFlare.cpp
     ${BBGEDIR}/Localization.cpp
     ${BBGEDIR}/Math.cpp
+    ${BBGEDIR}/MemoryAllocatorSmallBlock.cpp
     ${BBGEDIR}/MT.cpp
     ${BBGEDIR}/ParticleEffect.cpp
     ${BBGEDIR}/ParticleManager.cpp

From a7447cc59904bbc12ba4ba2c958fe8f86a083e88 Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Tue, 27 Aug 2013 01:42:31 +0200
Subject: [PATCH 2/2] Allow nodes to catch ACTION_SECONDARY.

---
 Aquaria/Game.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp
index 00b18be..f4a105f 100644
--- a/Aquaria/Game.cpp
+++ b/Aquaria/Game.cpp
@@ -6843,6 +6843,7 @@ void Game::bindInput()
 
 
 	dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY);
+	dsq->user.control.actionSet.importAction(this, "SecondaryAction", ACTION_SECONDARY);
 
 	dsq->user.control.actionSet.importAction(this, "Escape",		ACTION_ESC);