Skip to content

Commit

Permalink
Merge pull request #365 from bjz/examples
Browse files Browse the repository at this point in the history
Use [dev_dependencies.*] to reduce excessive recompilation
  • Loading branch information
emberian committed Sep 7, 2014
2 parents f8d3273 + 4c06f5c commit a00530a
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 102 deletions.
59 changes: 59 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ authors = [
"kvark",
]


[lib]
name = "gfx"
path = "src/gfx/lib.rs"
Expand All @@ -34,3 +35,61 @@ path = "src/device/"

[dependencies.render]
path = "src/render/"


[[example]]
name = "triangle"
path = "examples/triangle/main.rs"

[dev_dependencies.glfw]
git = "https://github.com/bjz/glfw-rs.git"


[[example]]
name = "cube"
path = "examples/cube/main.rs"

# [dev_dependencies.glfw]
# git = "https://github.com/bjz/glfw-rs.git"

[dev_dependencies.cgmath]
git = "http://github.com/bjz/cgmath-rs"


[[example]]
name = "terrain"
path = "examples/terrain/main.rs"

# [dev_dependencies.glfw]
# git = "https://github.com/bjz/glfw-rs.git"

# [dev_dependencies.cgmath]
# git = "http://github.com/bjz/cgmath-rs"

[dev_dependencies.genmesh]
git = "https://github.com/csherratt/genmesh.git"

[dev_dependencies.noise-rs]
git = "https://github.com/bjz/noise-rs.git"


[[example]]
name = "gl-init"
path = "examples/gl-init/main.rs"

[dev_dependencies.gl_init]
git = "https://github.com/tomaka/gl-init-rs.git"


[[example]]
name = "performance"
path = "examples/performance/main.rs"

# [dev_dependencies.glfw]
# git = "https://github.com/bjz/glfw-rs.git"

[dev_dependencies.gfx_gl]
git = "https://github.com/gfx-rs/gfx_gl.git"

# [dev_dependencies.cgmath]
# git = "http://github.com/bjz/cgmath-rs"
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ update:
(cd src/render && cargo update)
(cd src/gfx_macros && cargo update)
cargo update
make -C examples update
rm -rf doc

.PHONY: test
Expand Down Expand Up @@ -56,11 +55,9 @@ clean: clean-diagrams
(cd src/render && cargo clean)
(cd src/gfx_macros && cargo clean)
cargo clean
make -C examples clean
rm -rf doc

.PHONY: travis
travis: test doc
make -C examples
# the doc directory needs to be in the root for rust-ci
mv target/doc doc
19 changes: 0 additions & 19 deletions examples/cube/Cargo.toml

This file was deleted.

16 changes: 0 additions & 16 deletions examples/gl-init/Cargo.toml

This file was deleted.

22 changes: 0 additions & 22 deletions examples/performance/Cargo.toml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/performance/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

#![feature(phase)]
#![crate_name = "gfx-perf"]
#![crate_name = "performance"]
#![feature(globs)]

extern crate cgmath;
Expand Down
25 changes: 0 additions & 25 deletions examples/terrain/Cargo.toml

This file was deleted.

16 changes: 0 additions & 16 deletions examples/triangle/Cargo.toml

This file was deleted.

0 comments on commit a00530a

Please sign in to comment.