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

SCM Repository

[diderot] Diff of /branches/vis12-cl/src/compiler/c-target/c-target.sml
ViewVC logotype

Diff of /branches/vis12-cl/src/compiler/c-target/c-target.sml

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

revision 2513, Thu Nov 21 16:26:45 2013 UTC revision 2514, Thu Nov 21 16:27:12 2013 UTC
# Line 389  Line 389 
389    
390          fun compile (props : props, basename) = let          fun compile (props : props, basename) = let
391              (* generate the C compiler flags *)              (* generate the C compiler flags *)
392                val cflags = ["-I" ^ Paths.diderotInclude, "-I" ^ Paths.teemInclude]                val cflags = ["-I" ^ Paths.diderotInclude(), "-I" ^ Paths.teemInclude()]
393                val cflags = condCons (#parallel props, #pthread Paths.cflags, cflags)                val cflags = condCons (#parallel props, #pthread Paths.cflags, cflags)
394                val cflags = if #debug props                val cflags = if #debug props
395                      then #debug Paths.cflags :: cflags                      then #debug Paths.cflags :: cflags
# Line 402  Line 402 
402          fun ldFlags (props : props) = if #exec props          fun ldFlags (props : props) = if #exec props
403                then let                then let
404                  val extraLibs = condCons (#parallel props, #pthread Paths.extraLibs, [])                  val extraLibs = condCons (#parallel props, #pthread Paths.extraLibs, [])
405                  val extraLibs = Paths.teemLinkFlags @ #base Paths.extraLibs :: extraLibs                  val extraLibs = Paths.teemLinkFlags() @ #base Paths.extraLibs :: extraLibs
406                  val rtLib = Properties.runtimeName props                  val rtLib = Properties.runtimeName props
407                  in                  in
408                    rtLib :: extraLibs                    rtLib :: extraLibs

Legend:
Removed from v.2513  
changed lines
  Added in v.2514

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