Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kwhat committed Sep 3, 2014
2 parents 47203c0 + 0c6ec11 commit f24d442
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion doc/AUTORECONF.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ Use this task to update configuration files generated by
### Nested Elements

[AutoreconfTask.Include](AUTORECONF.md) extends [CcTask.Include](CCTASK.md)

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| prepend | Boolean | False | Use -B instead of the default -I
| prepend | Boolean | False | Use -B instead of the default -I


### Example
Expand Down
3 changes: 3 additions & 0 deletions doc/CC.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ Use this task to call the native compiler directly.
### Nested Elements

[CcTask.Arg](CCTASK.md)

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| value | String | "" | Argument to pass to the native compiler

[CcTask.Define](CCTASK.md)

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| name | String | | Name of defined variable
| value | String | | Value of defined variable

[CcTask.Include](CCTASK.md)

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| path | String | "." | Argument to pass to the native compiler
Expand Down
2 changes: 2 additions & 0 deletions doc/LD.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Use this task to call the native linker directly.

### Parameters

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| outfile | File | | Folder to execute the task in
Expand All @@ -14,6 +15,7 @@ Use this task to call the native linker directly.
### Nested Elements

[LDTask.LIBRARY](LD.md)

| Attribute | Type | Default | Description
|----------------|----------|------------------------|-----------------------------------------------------------------
| lib | String | | Name of the library to link against
Expand Down

0 comments on commit f24d442

Please sign in to comment.