diff --git a/.gitignore b/.gitignore index eb5a316..a9d37c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ target +Cargo.lock diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index c345b12..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,261 +0,0 @@ -[root] -name = "offscreen_gl_context" -version = "0.0.1" -dependencies = [ - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "azure" -version = "0.1.0" -source = "git+https://github.com/servo/rust-azure#91e18a325fa5fdee9b1634b44a3a3a7ac1fb09ff" -dependencies = [ - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", - "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)", - "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", - "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "skia 0.0.20130412 (git+https://github.com/servo/skia)", - "xlib 0.1.0 (git+https://github.com/servo/rust-xlib)", -] - -[[package]] -name = "bitflags" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "cgl" -version = "0.0.1" -source = "git+https://github.com/servo/rust-cgl#851ca1b90081d221c3c38d33548d3e22a19db79f" -dependencies = [ - "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core_foundation" -version = "0.1.0" -source = "git+https://github.com/servo/rust-core-foundation#c8236c28599b07894fa7d6887db2fa91bc7fda24" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core_graphics" -version = "0.1.0" -source = "git+https://github.com/servo/rust-core-graphics#2d8d665c5bdd116b4a1addbe5c415735fb78e1a9" -dependencies = [ - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core_text" -version = "0.1.0" -source = "git+https://github.com/servo/rust-core-text#2b4b546718310a9d3fe4273a1df092c79d9fb2c2" -dependencies = [ - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "egl" -version = "0.1.0" -source = "git+https://github.com/servo/rust-egl#c0159346b3adfdcf13f2cd86f5ee41750a72c078" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "expat-sys" -version = "2.1.0" -source = "git+https://github.com/servo/libexpat#2c23ee28deb8865b59bf45d8aeb37cefdd1443a6" - -[[package]] -name = "freetype" -version = "0.1.0" -source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "freetype-sys" -version = "2.4.11" -source = "git+https://github.com/servo/libfreetype2#50c1cf412d87f20ccbb940e39a14a38ae7cbb512" - -[[package]] -name = "geom" -version = "0.1.0" -source = "git+https://github.com/servo/rust-geom#c4bdb1ef8f4915ae636eb752b103f69246b50304" -dependencies = [ - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gl_common" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gl_generator" -version = "0.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gleam" -version = "0.0.1" -source = "git+https://github.com/servo/gleam#f2edabf2ef0474bb270b107e5e68c2727c4a422d" -dependencies = [ - "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "glx" -version = "0.0.1" -source = "git+https://github.com/servo/rust-glx#60ac0aee2438eadb4b51ddc8eac6fc4b5ca8e447" -dependencies = [ - "gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "io_surface" -version = "0.1.0" -source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d" -dependencies = [ - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "khronos_api" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "layers" -version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#9d17bea923a0bd148344fc142f7550ecbf1605af" -dependencies = [ - "azure 0.1.0 (git+https://github.com/servo/rust-azure)", - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)", - "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", - "egl 0.1.0 (git+https://github.com/servo/rust-egl)", - "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "gleam 0.0.1 (git+https://github.com/servo/gleam)", - "glx 0.0.1 (git+https://github.com/servo/rust-glx)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "skia 0.0.20130412 (git+https://github.com/servo/skia)", - "x11 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libc" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "log" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pkg-config" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "rand" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustc-serialize" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "skia" -version = "0.0.20130412" -source = "git+https://github.com/servo/skia#d60e6753b2b23b3b4ff787b505da56cfad0335c9" -dependencies = [ - "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)", - "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)", -] - -[[package]] -name = "x11" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xlib" -version = "0.1.0" -source = "git+https://github.com/servo/rust-xlib#1a0f3d48fbebf96e2d1bf83ac71309b27f49e0c7" -dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - diff --git a/Cargo.toml b/Cargo.toml index 48bb34f..39b9529 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,25 +10,32 @@ texture_surface = ["layers"] libc = "*" log = "*" -[dependencies.glx] -git = "https://github.com/servo/rust-glx" - -[dependencies.x11] -version = "*" -features = ["xlib"] - -[dependencies.cgl] -git = "https://github.com/servo/rust-cgl" - [dependencies.gleam] git = "https://github.com/servo/gleam" [dependencies.geom] git = "https://github.com/servo/rust-geom" -[dependencies.core_foundation] -git = "https://github.com/servo/rust-core-foundation" - [dependencies.layers] git = "https://github.com/servo/rust-layers" optional = true + +[target.x86_64-apple-darwin.dependencies.core_foundation] +git = "https://github.com/servo/rust-core-foundation" + +[target.x86_64-apple-darwin.dependencies.cgl] +git = "https://github.com/servo/rust-cgl" + +[target.i686-unknown-linux-gnu.dependencies.glx] +git = "https://github.com/servo/rust-glx" + +[target.x86_64-unknown-linux-gnu.dependencies.glx] +git = "https://github.com/servo/rust-glx" + +[target.i686-unknown-linux-gnu.dependencies.x11] +version = "*" +features = ["xlib"] + +[target.x86_64-unknown-linux-gnu.dependencies.x11] +version = "*" +features = ["xlib"]