michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop trying to use jemalloc on Windows. 

Closes #138.
This commit is contained in:
Patrick Walton 2019-05-02 11:12:33 -07:00
parent 5c5e4e9313
commit 66b5142334
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/native/Cargo.toml
View File

@ -10,7 +10,6 @@ pf-no-simd = ["pathfinder_simd/pf-no-simd"]
[dependencies] [dependencies]
color-backtrace = "0.1" color-backtrace = "0.1"
gl = "0.6" gl = "0.6"
jemallocator = "0.1"
nfd = "0.0.4" nfd = "0.0.4"
pretty_env_logger = "0.3" pretty_env_logger = "0.3"
sdl2 = "0.32" sdl2 = "0.32"
@ -30,3 +29,6 @@ path = "../../gpu"
[dependencies.pathfinder_simd] [dependencies.pathfinder_simd]
path = "../../simd" path = "../../simd"
[target.'cfg(not(windows))'.dependencies]
jemallocator = "0.1"

5
demo/native/src/main.rs
View File

@ -10,7 +10,6 @@
//! A demo app for Pathfinder using SDL 2. //! A demo app for Pathfinder using SDL 2.
use jemallocator;
use nfd::Response; use nfd::Response;
use pathfinder_demo::window::{Event, Keycode, SVGPath, View, Window, WindowSize}; use pathfinder_demo::window::{Event, Keycode, SVGPath, View, Window, WindowSize};
use pathfinder_demo::{DemoApp, Options}; use pathfinder_demo::{DemoApp, Options};
@ -26,6 +25,10 @@ use sdl2_sys::{SDL_Event, SDL_UserEvent};
use std::path::PathBuf; use std::path::PathBuf;
use std::ptr; use std::ptr;
#[cfg(not(windows))]
use jemallocator;
#[cfg(not(windows))]
#[global_allocator] #[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;