diff --git a/build/linux/Makefile b/build/linux/Makefile

index df4bb3d..91d7c18 100644

--- a/build/linux/Makefile

+++ b/build/linux/Makefile

@@ -56,9 +56,10 @@ OBJS = \

 	$(SRC)/Symbol.o			$(SRC)/TheGooniesApp.o \

 	$(SRC)/TheGoonies.o		$(SRC)/Vector.o

-CC = gcc

+CC = g++

 CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include

-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU

+LDFLAGS=

+LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lm

 RM = rm -f

 CP = cp -r

 MD = mkdir -p

@@ -72,7 +73,7 @@ all: $(EXE)

 	$(CC) $(CFLAGS) -c $< -o $@

 $(EXE): $(OBJS)

-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@

+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@

 	@$(STRIP) $@

 	@$(ECHO) " o If there are no errors, the game compiled succesfully"

diff --git a/src/auxiliar.cpp b/src/auxiliar.cpp

index ceab4de..c05d9a4 100644

--- a/src/auxiliar.cpp

+++ b/src/auxiliar.cpp

@@ -94,7 +94,7 @@ SDL_Surface *load_maskedimage(char *imagefile, char *maskfile, char *path)

     if (tmp == 0 ||

             mask == 0)

-        return false;

+        return NULL;

     res = SDL_DisplayFormatAlpha(tmp);