Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/src/compiler/common/paths_sml.in
ViewVC logotype

Diff of /branches/pure-cfg/src/compiler/common/paths_sml.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1034, Sun May 1 18:50:46 2011 UTC revision 1035, Sun May 1 19:23:10 2011 UTC
# Line 16  Line 16 
16    (* directories for Diderot stuff *)    (* directories for Diderot stuff *)
17      val diderotBin = "@DIDEROT_ROOT@" // "bin"      val diderotBin = "@DIDEROT_ROOT@" // "bin"
18      val diderotInclude = "@DIDEROT_ROOT@" // "src/include"      val diderotInclude = "@DIDEROT_ROOT@" // "src/include"
19      val diderotLib = "@DIDEROT_ROOT@" // "src/lib"      val diderotSrc = "@DIDEROT_ROOT@" // "src"
20        val diderotLib = diderotSrc // "lib"
21    
22    (* directories for Teem stuff *)    (* directories for Teem stuff *)
23      val teemBin = "@TEEM_DIR@" // "bin"      val teemBin = "@TEEM_DIR@" // "bin"
# Line 30  Line 31 
31      val installBin = "@prefix@" // "bin"      val installBin = "@prefix@" // "bin"
32      val installInclude = "@prefix@" // "include"      val installInclude = "@prefix@" // "include"
33      val installLib = "@prefix@" // "lib"      val installLib = "@prefix@" // "lib"
     end (* local *)  
34    
35    (* paths to some useful tools *)    (* paths to some useful tools *)
36      local      local
# Line 56  Line 56 
56                    (* end case *))                    (* end case *))
57              end              end
58      in      in
59      val dnorm = findExe ([diderotBin, installBin], "dnorm")      val dnorm = findExe ([diderotBin, installBin, diderotSrc // "dnorm"], "dnorm")
60      val cc = let      val cc = let
61            val (cmd::args) = String.tokens Char.isSpace "@CC@"            val (cmd::args) = String.tokens Char.isSpace "@CC@"
62            val cmd = findExe (PATH, cmd)            val cmd = findExe (PATH, cmd)
# Line 66  Line 66 
66      val cflags = "@CFLAGS@ @PTHREAD_CFLAGS@"      val cflags = "@CFLAGS@ @PTHREAD_CFLAGS@"
67      val extraLibs = "@PTHREAD_LIBS@ @LIBM@"      val extraLibs = "@PTHREAD_LIBS@ @LIBM@"
68      end (* local *)      end (* local *)
69        end (* local *)
70    
71    end    end

Legend:
Removed from v.1034  
changed lines
  Added in v.1035

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0