From 2301bec43b4e6998926ee26f03257c2bef1e600b Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Sat, 12 Jul 2014 23:56:35 +0300 Subject: [PATCH 1/3] get_render_target fix --- src/sdl2/render.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index d6c92bea..841f9ac4 100644 --- a/src/sdl2/render.rs +++ b/src/sdl2/render.rs @@ -370,13 +370,13 @@ impl Renderer { } } - pub fn get_render_target(&self) -> SdlResult { + pub fn get_render_target(&self) -> Option { let raw = unsafe { ll::SDL_GetRenderTarget(self.raw) }; if raw == ptr::null() { - Err(get_error()) + None } else { - Ok(Texture{ + Some(Texture{ raw: raw, owned: false }) From db0fcb84cacdf26cb541bbfbcd668d6fca76674e Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Sun, 13 Jul 2014 00:07:07 +0300 Subject: [PATCH 2/3] Travis build fix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3d792fb5..7c2735a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ install: - ./configure && make && sudo make install - cd - script: + - export LD_LIBRARY_PATH="/usr/local/lib/:$LD_LIBRARY_PATH" - make compile_demo From c7a8361b156bc550f7cda42dab2272543a2efebf Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Sun, 13 Jul 2014 00:13:51 +0300 Subject: [PATCH 3/3] switched export order --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c2735a5..f240f1f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,11 @@ before_install: - tar xf rust-nightly-x86_64-unknown-linux-gnu.tar.gz install: - sudo ./rust-nightly-x86_64-unknown-linux-gnu/install.sh + - export LD_LIBRARY_PATH="/usr/local/lib/:$LD_LIBRARY_PATH" - wget http://www.libsdl.org/release/SDL2-2.0.0.tar.gz - tar -zxvf SDL2-2.0.0.tar.gz - cd SDL2-2.0.0 - ./configure && make && sudo make install - cd - script: - - export LD_LIBRARY_PATH="/usr/local/lib/:$LD_LIBRARY_PATH" - make compile_demo