Use import code from library instead of environments to link with Gtk and GtkSheet

5 files changed, 13 insertions, 140 deletions

diff --git a/config/Gtk.linux.env b/config/Gtk.linux.env
deleted file mode 100644
index 5c83ebb..0000000
--- a/config/Gtk.linux.env
+++ /dev/null
@@ -1,36 +0,0 @@
-Version: 1.0
-Environments
-	Environment
-		EnvironmentName:	Gtk
-		EnvironmentPaths
-			Path:	{Application}/lib/StdEnv
-		EnvironmentCompiler:	lib/exe/cocl
-		EnvironmentABCOptimise:	lib/exe/abcopt
-		EnvironmentByteCodeGen:	lib/exe/bcgen
-		EnvironmentByteCodeLink:	lib/exe/bclink
-		EnvironmentByteCodeStrip:	lib/exe/bcstrip
-		EnvironmentByteCodePrelink:	lib/exe/bcprelink
-		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc::-Wl,--gc-sections -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	True
-	Environment
-		EnvironmentName:	Gtk with GtkSheet
-		EnvironmentPaths
-			Path:	{Application}/lib/StdEnv
-		EnvironmentCompiler:	lib/exe/cocl
-		EnvironmentABCOptimise:	lib/exe/abcopt
-		EnvironmentByteCodeGen:	lib/exe/bcgen
-		EnvironmentByteCodeLink:	lib/exe/bclink
-		EnvironmentByteCodeStrip:	lib/exe/bcstrip
-		EnvironmentByteCodePrelink:	lib/exe/bcprelink
-		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc::-Wl,--gc-sections -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgtksheet-4.0
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	True
diff --git a/config/Gtk.linux.prt b/config/Gtk.linux.prt
deleted file mode 100644
index aae3997..0000000
--- a/config/Gtk.linux.prt
+++ /dev/null
@@ -1,52 +0,0 @@
-Version: 1.5
-Global
-	ProjectRoot:	.
-	Target:	Gtk
-	CodeGen
-		CheckStacks:	False
-		CheckIndexes:	True
-		OptimiseABC:	False
-		GenerateByteCode:	False
-	Application
-		HeapSize:	2097152
-		StackSize:	512000
-		ExtraMemory:	8192
-		IntialHeapSize:	204800
-		HeapSizeMultiplier:	4096
-		ShowExecutionTime:	False
-		ShowGC:	False
-		ShowStackSize:	False
-		MarkingCollector:	False
-		DisableRTSFlags:	False
-		StandardRuntimeEnv:	True
-		Profile
-			Memory:	False
-			MemoryMinimumHeapSize:	0
-			Time:	False
-			Stack:	False
-			Dynamics:	False
-			GenericFusion:	False
-			DescExL:	False
-		Output
-			Output:	ShowConstructors
-			Font:	Courier
-			FontSize:	9
-			WriteStdErr:	False
-	Link
-		LinkMethod:	Static
-		GenerateRelocations:	False
-		GenerateSymbolTable:	False
-		GenerateLinkMap:	False
-		LinkResources:	False
-		ResourceSource:	
-		GenerateDLL:	False
-		ExportedNames:	
-		StripByteCode:	True
-		KeepByteCodeSymbols:	True
-		PrelinkByteCode:	True
-	Paths
-		Path:	{Application}*lib*Dynamics
-		Path:	{Application}*lib*Platform
-		Path:	{Application}*lib*Gtk
-	Precompile:	
-	Postlink:	
diff --git a/config/GtkSheet.linux.prt b/config/GtkSheet.linux.prt
deleted file mode 100644
index 3eca7e5..0000000
--- a/config/GtkSheet.linux.prt
+++ /dev/null
@@ -1,52 +0,0 @@
-Version: 1.5
-Global
-	ProjectRoot:	.
-	Target:	Gtk with GtkSheet
-	CodeGen
-		CheckStacks:	False
-		CheckIndexes:	True
-		OptimiseABC:	False
-		GenerateByteCode:	False
-	Application
-		HeapSize:	2097152
-		StackSize:	512000
-		ExtraMemory:	8192
-		IntialHeapSize:	204800
-		HeapSizeMultiplier:	4096
-		ShowExecutionTime:	False
-		ShowGC:	False
-		ShowStackSize:	False
-		MarkingCollector:	False
-		DisableRTSFlags:	False
-		StandardRuntimeEnv:	True
-		Profile
-			Memory:	False
-			MemoryMinimumHeapSize:	0
-			Time:	False
-			Stack:	False
-			Dynamics:	False
-			GenericFusion:	False
-			DescExL:	False
-		Output
-			Output:	ShowConstructors
-			Font:	Courier
-			FontSize:	9
-			WriteStdErr:	False
-	Link
-		LinkMethod:	Static
-		GenerateRelocations:	False
-		GenerateSymbolTable:	False
-		GenerateLinkMap:	False
-		LinkResources:	False
-		ResourceSource:	
-		GenerateDLL:	False
-		ExportedNames:	
-		StripByteCode:	True
-		KeepByteCodeSymbols:	True
-		PrelinkByteCode:	True
-	Paths
-		Path:	{Application}*lib*Dynamics
-		Path:	{Application}*lib*Platform
-		Path:	{Application}*lib*Gtk
-	Precompile:	
-	Postlink:	
diff --git a/src/Gtk/Internal.icl b/src/Gtk/Internal.icl
index c76f01a..8a32b2c 100644
--- a/src/Gtk/Internal.icl
+++ b/src/Gtk/Internal.icl
@@ -7,6 +7,17 @@ import StdDebug
 import System._Pointer
 
 import code from "clean_gtk_support."
+import code from library "-lgtk-3"
+import code from library "-lgdk-3"
+import code from library "-lpangocairo-1.0"
+import code from library "-lpango-1.0"
+import code from library "-latk-1.0"
+import code from library "-lcairo-gobject"
+import code from library "-lcairo"
+import code from library "-lgdk_pixbuf-2.0"
+import code from library "-lgio-2.0"
+import code from library "-lgobject-2.0"
+import code from library "-lglib-2.0"
 
 g_free :: !Pointer !.a -> .a
 g_free p env = code {
diff --git a/src/Gtk/Widgets/Sheet/Internal.icl b/src/Gtk/Widgets/Sheet/Internal.icl
index 9717cb1..d465984 100644
--- a/src/Gtk/Widgets/Sheet/Internal.icl
+++ b/src/Gtk/Widgets/Sheet/Internal.icl
@@ -5,6 +5,8 @@ import StdMaybe
 
 import System._Pointer
 
+import code from library "-lgtksheet-4.0"
+
 gtk_sheet_new :: !Int !Int !String !.a -> (!Pointer, !.a)
 gtk_sheet_new rows cols title env = new rows cols (packString title) env
 where