@@ -45,7 +45,9 @@ END) (@libs addObject:"edit")) (else (@libs addObjectsFromList:(list "readline" "m" "gnustep-base")) (@inc_dirs addObject:"/usr/include/GNUstep/Headers") - (@lib_dirs addObject:"/usr/lib/GNUstep/System/Library/Libraries"))) + ;; this will be set by gnustep-config: + ;; (@lib_dirs addObject:"/usr/lib/GNUstep/System/Library/Libraries") + )) (if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@inc_dirs addObject:"#{@prefix}/include")) (if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib")) @@ -88,9 +90,10 @@ END) (ifDarwin (then (set @cflags "-Wall -g -O2 -DDARWIN -DMACOSX #{@sdk} #{@leopard} -std=gnu99") - (set @mflags "-fobjc-exceptions -fobjc-gc")) ;; Want to try Apple's new GC? Add this: "-fobjc-gc" + (set @mflags "-fobjc-exceptions")) ;; Want to try Apple's new GC? Add this: "-fobjc-gc" (else (set @cflags "-Wall -DLINUX -g -std=gnu99 ") - (set @mflags "-fobjc-exceptions -fconstant-string-class=NSConstantString"))) + ;; (set @mflags "-fobjc-exceptions -fconstant-string-class=NSConstantString") + (set @mflags ((NSString stringWithShellCommand:"gnustep-config --objc-flags") chomp)))) (ifDarwin (then (set @arch '("ppc" "i386")))) ;; build a universal binary @@ -133,6 +136,10 @@ END) (if ((NSFileManager defaultManager) fileExistsAtPath:(+ example-dir "/Nukefile")) (SH "cd #{example-dir}; nuke clobber"))))) +(ifLinux + (set @gnustep_flags ((NSString stringWithShellCommand:"gnustep-config --base-libs") chomp))) + + (set nush_thin_binaries (NSMutableArray array)) (@arch each: (do (architecture) @@ -144,7 +151,7 @@ END) (SH "#{@cc} #{@cflags} #{@mflags} main/main.m -arch #{architecture} -F. -framework Nu #{@ldflags} -o #{(target name)}"))) (else (file nush_thin_binary => "dylib" (@c_objects objectForKey:architecture) (@m_objects objectForKey:architecture) is - (SH "#{@cc} #{@cflags} #{@mflags} main/main.m #{@library_executable_name} #{@ldflags} -o #{(target name)}")))))) + (SH "#{@cc} #{@cflags} #{@mflags} main/main.m #{@library_executable_name} #{@ldflags} #{@gnustep_flags} -o #{(target name)}")))))) (file "nush" => "framework" nush_thin_binaries is (ifDarwin Nukefile @@ -62,7 +62,8 @@ if SYSTEM == "Darwin" @mflags = "-fobjc-exceptions" else @cflags = "-g -O2 -Wall -DLINUX -DMININUSH -std=gnu99 #{@leopard_cflags}" - @mflags = "-fobjc-exceptions -fconstant-string-class=NSConstantString" + # @mflags = "-fobjc-exceptions -fconstant-string-class=NSConstantString" + @mflags = `gnustep-config --objc-flags`.chomp end @cflags += @inc_dirs.map {|inc| " -I#{inc}"}.join @@ -70,7 +71,9 @@ end @ldflags += @libs.map {|lib| " -l#{lib}"}.join @ldflags += @lib_dirs.map {|libdir| " -L#{libdir}"}.join if SYSTEM == "Linux" - @ldflags += " -lobjc -lNuFound" + # @ldflags += " -lobjc -lNuFound" + @ldflags += " " + @ldflags += `gnustep-config --base-libs`.chomp @ldflags += " -Wl,--rpath -Wl,/usr/local/lib" end Rakefile @@ -151,7 +151,11 @@ int NuMain(int argc, const char *argv[], const char *envp[]) else { // collect the command-line arguments [[NuApplication sharedApplication] setArgc:argc argv:argv startingAtIndex:i+1]; +#ifdef DARWIN id string = [NSString stringWithContentsOfFile:[NSString stringWithCString:argv[i] encoding:NSUTF8StringEncoding] encoding:NSUTF8StringEncoding error:NULL]; +#else + id string = [NSString stringWithContentsOfFile:[NSString stringWithCString:argv[i] encoding:NSUTF8StringEncoding]]; +#endif if (string) { id script = [parser parse:string asIfFromFilename:argv[i]]; [parser eval:script]; objc/nu.m f4dbe16444b077c71563c1f551a9b01b2c655f15 Jeff Buck jeffreybuck@mac.com http://github.com/timburks/nu/commit/4d77e9bb24a9afa7b16687756b23e513eb2ce6c2 4d77e9bb24a9afa7b16687756b23e513eb2ce6c2 2009-07-03T01:27:44-07:00 2009-07-03T01:27:44-07:00 Updated build settings for Linux f67fe695aeed80e9c828bdcbfb53dcbab48529d2 Jeff Buck jeffreybuck@mac.com