From 94d82d426004b72eed0502dc926a1adda70b071b Mon Sep 17 00:00:00 2001 From: Kolja Kube Date: Mon, 13 Jan 2014 20:20:18 +0100 Subject: [PATCH 1/3] println is not in prelude anymore, the println! macro should be used --- src/codegen/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codegen/main.rs b/src/codegen/main.rs index 97193d00..ae8b5424 100644 --- a/src/codegen/main.rs +++ b/src/codegen/main.rs @@ -16,7 +16,7 @@ fn main() { let args = os::args(); match args.len() { 0 => { - println("usage: codegen [keycode|scancode].rs destdir"); + println!("usage: codegen [keycode|scancode].rs destdir"); os::set_exit_status(1); }, 3 => { From 16dea1567239dca6046c34ea702f9cfd5754b614 Mon Sep 17 00:00:00 2001 From: Kolja Kube Date: Fri, 17 Jan 2014 14:37:54 +0100 Subject: [PATCH 2/3] made check for empty SDL_MODE environment variable more robust --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e8a1a1b7..4eead448 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ UNAME=$(shell uname) ifeq ($(UNAME),Darwin) # If the user wasn't explicit, see if SDL2 library exists - ifeq ($(SDL_MODE),) + ifeq ($(strip $(SDL_MODE)),"") SDL_CHECK=$(shell pkg-config --exists sdl2) ifeq ($(SDL_CHECK),0) SDL_MODE = dylib From 115abad1109a0d298b6846618b5a1408cab11405 Mon Sep 17 00:00:00 2001 From: Kolja Kube Date: Fri, 17 Jan 2014 14:46:02 +0100 Subject: [PATCH 3/3] reverted println! to println --- src/codegen/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codegen/main.rs b/src/codegen/main.rs index ae8b5424..97193d00 100644 --- a/src/codegen/main.rs +++ b/src/codegen/main.rs @@ -16,7 +16,7 @@ fn main() { let args = os::args(); match args.len() { 0 => { - println!("usage: codegen [keycode|scancode].rs destdir"); + println("usage: codegen [keycode|scancode].rs destdir"); os::set_exit_status(1); }, 3 => {