changeset 23:420969b22201

Removed an import to a private library. Added support for building as a dynamic library and framework
author Jacob Carlborg <doob@me.com>
date Wed, 10 Feb 2010 17:29:12 +0100
parents f8a3b67adfcb
children ab33fc0c3fc1
files .hgignore dsss.conf dstep/objc/objc.d dstep/objc/runtime.d
diffstat 4 files changed, 29 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Feb 09 18:02:03 2010 +0100
+++ b/.hgignore	Wed Feb 10 17:29:12 2010 +0100
@@ -12,4 +12,5 @@
 *.dylib
 *.dstep
 main.d
-main
\ No newline at end of file
+main
+*.framework
\ No newline at end of file
--- a/dsss.conf	Tue Feb 09 18:02:03 2010 +0100
+++ b/dsss.conf	Wed Feb 10 17:29:12 2010 +0100
@@ -1,9 +1,32 @@
-[dstep]
-#target=cocoa-d-test
-
+[main.d]
+target=cocoa-d-test
 
 version (GNU){
-    buildflags += -framework Foundation -framework ApplicationServices -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework Security -framework QuartzCore -framework QTKit -framework AppKit -framework CoreData
+	buildflags += -framework Foundation -framework ApplicationServices -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework Security -framework QuartzCore -framework QTKit -framework AppKit -framework CoreData
+
+	version (dylib) {
+		postbuild = cd dsss_objs/G ; \
+					gcc *.o -dynamiclib -o ../../libDG-dstep.dylib					
+					
+		version (Tango) {
+			postbuild += -lgtango
+		}
+		
+		postbuild += -lgphobos -lgcc_eh -install_name ../Frameworks -framework Foundation -framework ApplicationServices -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework Security -framework QuartzCore -framework QTKit -framework AppKit -framework CoreData
+	}
+	
+	version (framework) {
+		postbuild = cd dsss_objs/G ; \
+					gcc *.o -dynamiclib -lgphobos -lgcc_eh
+		
+		version (Tango) {
+			postbuild += -lgtango 
+		}
+		
+		postbuild += -install_name ../Frameworks -o ../../DStep.framework/Versions/Current/DStep -framework Cocoa -framework QTKit -framework QuartzCore -framework Security -framework DiskArbitration -framework CoreServices -framework CoreFoundation -framework ApplicationServices;
+		postbuild += cd ../../;
+		postbuild += cp -R dstep DStep.framework/Headers/
+	}
 }
 
 version (LDC) {
--- a/dstep/objc/objc.d	Tue Feb 09 18:02:03 2010 +0100
+++ b/dstep/objc/objc.d	Wed Feb 10 17:29:12 2010 +0100
@@ -12,8 +12,6 @@
 import dstep.objc.message;
 import dstep.objc.runtime;
 
-import mambo.io;
-
 alias objc_object* id;
 alias objc_class* Class;
 alias objc_selector* SEL;
--- a/dstep/objc/runtime.d	Tue Feb 09 18:02:03 2010 +0100
+++ b/dstep/objc/runtime.d	Wed Feb 10 17:29:12 2010 +0100
@@ -6,8 +6,6 @@
  */
 module dstep.objc.runtime;
 
-import mambo.io;
-
 import dstep.internal.String;
 import dstep.internal.Types;
 import dstep.internal.Version;