[gbrainy] Fix mono.addins



commit 718c2a069828d23903a0c8d2ff1a1a33867af705
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Nov 21 17:06:06 2009 +0100

    Fix mono.addins

 sample_extensions/Calculation/CalculationSample.cs |    3 +++
 sample_extensions/Logic/PuzzleSample.cs            |    3 +++
 sample_extensions/Memory/MemorySample.cs           |    3 +++
 src/Clients/Classical/Makefile.am                  |    4 +---
 src/Core/Makefile.am                               |    5 +++--
 src/{Clients/Classical => Core}/gbrainy.addin.xml  |    8 ++++----
 6 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/sample_extensions/Calculation/CalculationSample.cs b/sample_extensions/Calculation/CalculationSample.cs
index db71973..d3bb5c6 100644
--- a/sample_extensions/Calculation/CalculationSample.cs
+++ b/sample_extensions/Calculation/CalculationSample.cs
@@ -22,6 +22,9 @@ using Cairo;
 using System.Text;
 using Mono.Unix;
 
+using gbrainy.Core.Main;
+using gbrainy.Core.Libraries;
+
 public class CalculationSample : Game
 {
 	private int number_a, number_b;
diff --git a/sample_extensions/Logic/PuzzleSample.cs b/sample_extensions/Logic/PuzzleSample.cs
index c8e1947..3587df7 100644
--- a/sample_extensions/Logic/PuzzleSample.cs
+++ b/sample_extensions/Logic/PuzzleSample.cs
@@ -21,6 +21,9 @@ using Cairo;
 using Mono.Unix;
 using System;
 
+using gbrainy.Core.Main;
+using gbrainy.Core.Libraries;
+
 public class PuzzleSample : Game
 {
 	public override string Name {
diff --git a/sample_extensions/Memory/MemorySample.cs b/sample_extensions/Memory/MemorySample.cs
index 15570ac..0e1c6b1 100644
--- a/sample_extensions/Memory/MemorySample.cs
+++ b/sample_extensions/Memory/MemorySample.cs
@@ -23,6 +23,9 @@ using Mono.Unix;
 using System.Timers;
 using System.Collections.Generic;
 
+using gbrainy.Core.Main;
+using gbrainy.Core.Libraries;
+
 public class MemorySample : Memory
 {
 	ArrayListIndicesRandom animals_order;
diff --git a/src/Clients/Classical/Makefile.am b/src/Clients/Classical/Makefile.am
index da3f4bd..815ef93 100644
--- a/src/Clients/Classical/Makefile.am
+++ b/src/Clients/Classical/Makefile.am
@@ -32,8 +32,7 @@ RESOURCES =										\
 -resource:$(top_srcdir)/data/app-graphics/memory-games-32.png  \
 -resource:$(top_srcdir)/data/app-graphics/verbal-games.svg  \
 -resource:$(top_srcdir)/data/app-graphics/verbal-games-32.png  \
--resource:$(top_srcdir)/data/app-graphics/gbrainy.svg  \
--resource:$(srcdir)/gbrainy.addin.xml
+-resource:$(top_srcdir)/data/app-graphics/gbrainy.svg
 
 gbrainydir = $(libdir)/gbrainy
 gbrainy_SCRIPTS = ../../gbrainy.exe
@@ -50,7 +49,6 @@ all: ../../gbrainy.exe
 
 EXTRA_DIST =					\
 	gbrainy.glade \
-	$(srcdir)/gbrainy.addin.xml \
 	$(srcdir)/mono-addins-strings.xml \
 	$(GBRAINY_CSDISTFILES)			
 
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index c118a52..4f95992 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -1,4 +1,4 @@
-CSFLAGS = -target:library 
+CSFLAGS = -target:library $(CSC_DEFINES)
 
 TARGET = ../gbrainy.Core.dll
 
@@ -36,7 +36,8 @@ $(top_srcdir)/data/app-graphics/background.svg  	\
 $(top_srcdir)/data/app-graphics/logic-games.svg		\
 $(top_srcdir)/data/app-graphics/math-games.svg		\
 $(top_srcdir)/data/app-graphics/memory-games.svg	\
-$(top_srcdir)/data/app-graphics/verbal-games.svg	
+$(top_srcdir)/data/app-graphics/verbal-games.svg	\
+$(srcdir)/gbrainy.addin.xml
 
 
 REFS =  \
diff --git a/src/Clients/Classical/gbrainy.addin.xml b/src/Core/gbrainy.addin.xml
similarity index 56%
rename from src/Clients/Classical/gbrainy.addin.xml
rename to src/Core/gbrainy.addin.xml
index 39d75d2..e5dbd2f 100644
--- a/src/Clients/Classical/gbrainy.addin.xml
+++ b/src/Core/gbrainy.addin.xml
@@ -1,19 +1,19 @@
 <Addin namespace="gbrainy" id="gbrainy" version="1.00" isroot="true" compatVersion="1.00">
 
 	<Runtime>
-		<Import assembly="gbrainy.exe" />
+		<Import assembly="gbrainy.Core.dll" />
 	</Runtime>
 
 	<ExtensionPoint path="/gbrainy/games/logic">
-		<ExtensionNode name="Logic" objectType="Game" />
+		<ExtensionNode name="Logic" objectType="gbrainy.Core.Main.Game" />
 	</ExtensionPoint>
 
 	<ExtensionPoint path="/gbrainy/games/memory">
-		<ExtensionNode name="Memory" objectType="Memory" />
+		<ExtensionNode name="Memory" objectType="gbrainy.Core.Main.Memory" />
 	</ExtensionPoint>
 
 	<ExtensionPoint path="/gbrainy/games/calculation">
-		<ExtensionNode name="Calculation" objectType="Game" />
+		<ExtensionNode name="Calculation" objectType="gbrainy.Core.Main.Game" />
 	</ExtensionPoint>
 
 </Addin>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]