Skip to content

Commit

Permalink
Configure and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Zakarum committed Nov 30, 2018
1 parent e721726 commit 8f8abc6
Show file tree
Hide file tree
Showing 16 changed files with 80 additions and 809 deletions.
42 changes: 33 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
language: rust
rust:
- stable
- beta
- nightly
cache:
cargo: true
directories:
- $HOME/deps

compiler: clang

matrix:
allow_failures:
- rust: nightly
fast_finish: true
script:
- cargo test --verbose --all
include:
# Linux 64bit
- os: linux
rust: stable
- os: linux
rust: nightly

# macOS 64bit
- env: MACOSX_DEPLOYMENT_TARGET=10.9
os: osx
rust: stable
osx_image: xcode9
- env: MACOSX_DEPLOYMENT_TARGET=10.9
os: osx
rust: nightly
osx_image: xcode9

# iPhoneOS 64bit
- env: TARGET=aarch64-apple-ios
os: osx
osx_image: xcode9
rust: nightly

branches:
only:
- staging
- trying
- master

script:
- make
20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
RUST_BACKTRACE:=1
RENDY_FEATURES:=

ifeq ($(OS),Windows_NT)
RENDY_FEATURES=dx12
else
UNAME_S:=$(shell uname -s)
ifeq ($(UNAME_S),Linux)
RENDY_FEATURES=vulkan
endif
ifeq ($(UNAME_S),Darwin)
RENDY_FEATURES=metal
endif
endif

test:
cd rendy && cargo test --all --features $(RENDY_FEATURES)

doc:
cargo doc
2 changes: 2 additions & 0 deletions factory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ version = "0.1.0"
authors = ["omni-viral <[email protected]>"]

[features]
empty = ["gfx-backend-empty", "rendy-wsi/gfx-backend-empty"]
dx12 = ["gfx-backend-dx12", "rendy-wsi/gfx-backend-dx12"]
metal = ["gfx-backend-metal", "rendy-wsi/gfx-backend-metal"]
vulkan = ["gfx-backend-vulkan", "rendy-wsi/gfx-backend-vulkan"]

[dependencies]
derivative = "1.0"
failure = "0.1"
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", optional = true }
Expand Down
1 change: 1 addition & 0 deletions factory/src/factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ macro_rules! init_factory_for_backend {

($target:ident, $config:ident) => {{
init_factory_for_backend!(match $target, $config
| gfx_backend_empty @ cfg(feature = "empty")
| gfx_backend_dx12 @ cfg(feature = "dx12")
| gfx_backend_metal @ cfg(feature = "metal")
| gfx_backend_vulkan @ cfg(feature = "vulkan")
Expand Down
4 changes: 3 additions & 1 deletion rendy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["omni-viral <[email protected]>"]

[features]
empty = ["rendy-factory/empty", "rendy-wsi/empty", "gfx-backend-empty"]
dx12 = ["rendy-factory/dx12", "rendy-wsi/dx12", "gfx-backend-dx12"]
metal = ["rendy-factory/metal", "rendy-wsi/metal", "gfx-backend-metal"]
vulkan = ["rendy-factory/vulkan", "rendy-wsi/vulkan", "gfx-backend-vulkan"]
Expand All @@ -20,12 +21,13 @@ rendy-renderer = { path = "../renderer" }
rendy-resource = { path = "../resource" }
rendy-wsi = { path = "../wsi" }

gfx-hal = { git = "https://github.com/gfx-rs/gfx" }
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", optional = true }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", optional = true }

[dev-dependencies]
gfx-hal = { git = "https://github.com/gfx-rs/gfx" }
env_logger = "0.5"
failure = "0.1"
lazy_static = "1.0"
Expand Down
47 changes: 0 additions & 47 deletions rendy/examples/init.rs

This file was deleted.

31 changes: 0 additions & 31 deletions rendy/examples/simple.comp

This file was deleted.

12 changes: 0 additions & 12 deletions rendy/examples/simple.frag

This file was deleted.

Loading

0 comments on commit 8f8abc6

Please sign in to comment.