From 40a6c232e9169a9cfe0d6a698b728c8565cd8959 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Thu, 14 Jul 2011 20:08:06 +0200
Subject: COMPOSER: Add a first attempt at an engine.

---
 base/plugins.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 4413995b88..4fa1a961da 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -97,6 +97,9 @@ public:
 		#if PLUGIN_ENABLED_STATIC(CINE)
 		LINK_PLUGIN(CINE)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(COMPOSER)
+		LINK_PLUGIN(COMPOSER)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(CRUISE)
 		LINK_PLUGIN(CRUISE)
 		#endif
-- 
cgit v1.2.3


From 59739a7a0e3e4826ba7b27d5270a8d7a26b787ef Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Sun, 7 Aug 2011 21:33:32 +1000
Subject: BADA: Initial BADA port implementation

---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 4fa1a961da..5de18f9678 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -190,7 +190,7 @@ public:
 		// static/dynamic plugin, like it's done for the engines
 		LINK_PLUGIN(AUTO)
 		LINK_PLUGIN(NULL)
-		#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+    #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(BADA)
 		LINK_PLUGIN(WINDOWS)
 		#endif
 		#if defined(USE_ALSA)
-- 
cgit v1.2.3


From 8a2243ff36fc7938018cc17ce1da5e20ae2d4409 Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Wed, 17 Aug 2011 08:50:26 +1000
Subject: BADA: Remove BADA defined check. Was a temp fix for simulator build

---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 5de18f9678..737ffa3b59 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -190,7 +190,7 @@ public:
 		// static/dynamic plugin, like it's done for the engines
 		LINK_PLUGIN(AUTO)
 		LINK_PLUGIN(NULL)
-    #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(BADA)
+    #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		LINK_PLUGIN(WINDOWS)
 		#endif
 		#if defined(USE_ALSA)
-- 
cgit v1.2.3


From 4da83afa5ac735ffbc9e2b354170af09bc1a0e8d Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Mon, 22 Aug 2011 09:48:42 +0200
Subject: BASE: Fix indentation

---
 base/plugins.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base/plugins.cpp')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 737ffa3b59..4fa1a961da 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -190,7 +190,7 @@ public:
 		// static/dynamic plugin, like it's done for the engines
 		LINK_PLUGIN(AUTO)
 		LINK_PLUGIN(NULL)
-    #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+		#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
 		LINK_PLUGIN(WINDOWS)
 		#endif
 		#if defined(USE_ALSA)
-- 
cgit v1.2.3