Index: client/Client/Button.cpp
===================================================================
--- client/Client/Button.cpp	(revision cdb4bec03046cb6823e52433c95f41a2426aaa2f)
+++ client/Client/Button.cpp	(revision 3f5616f3b017dce931cf98037b90da331235feb8)
@@ -20,5 +20,10 @@
 
    al_draw_text(font, al_map_rgb(0, 255, 0), this->width/2, (this->height-fontHeight)/2, ALLEGRO_ALIGN_CENTRE, str.c_str());
-   al_draw_rectangle(1, 1, this->width, this->height, al_map_rgb(0, 255, 0), 1);
+
+   #ifdef WINDOWS
+      al_draw_rectangle(1, 1, this->width, this->height, al_map_rgb(0, 255, 0), 1);
+   #else
+      al_draw_rectangle(1, 0, this->width, this->height-1, al_map_rgb(0, 255, 0), 1);
+   #endif
 
    al_set_target_bitmap(al_get_backbuffer(display));
Index: client/Client/Textbox.cpp
===================================================================
--- client/Client/Textbox.cpp	(revision cdb4bec03046cb6823e52433c95f41a2426aaa2f)
+++ client/Client/Textbox.cpp	(revision 3f5616f3b017dce931cf98037b90da331235feb8)
@@ -68,5 +68,10 @@
 
    al_draw_text(font, al_map_rgb(0, 255, 0), textPos, (this->height-fontHeight)/2, ALLEGRO_ALIGN_LEFT, str.c_str());
-   al_draw_rectangle(1, 1, this->width, this->height, al_map_rgb(0, 255, 0), 1);
+
+   #ifdef WINDOWS
+      al_draw_rectangle(1, 1, this->width, this->height, al_map_rgb(0, 255, 0), 1);
+   #else
+      al_draw_rectangle(1, 0, this->width, this->height-1, al_map_rgb(0, 255, 0), 1);
+   #endif
 
    al_set_target_bitmap(al_get_backbuffer(display));
Index: client/makefile
===================================================================
--- client/makefile	(revision cdb4bec03046cb6823e52433c95f41a2426aaa2f)
+++ client/makefile	(revision 3f5616f3b017dce931cf98037b90da331235feb8)
@@ -1,2 +1,18 @@
-gameClient : ../common/Message.cpp Client/main.cpp
-	g++ -o $@ $?
+CC = g++
+LIB_FLAGS = `pkg-config --cflags --libs --static allegro-static-5.0 allegro_ttf-static-5.0 allegro_primitives-static-5.0`
+FLAGS = $(LIB_FLAGS)
+COMMON_PATH = ../common
+DEPENDENCIES = Message.o chat.o GuiComponent.o Window.o Textbox.o Button.o
+
+gameClient : Client/main.cpp $(DEPENDENCIES)
+	$(CC) -o $@ $+ $(FLAGS)
+
+Message.o : $(COMMON_PATH)/Message.cpp
+	$(CC) -c -o $@ $? $(FLAGS)
+
+%.o : Client/%.cpp
+	$(CC) -c -o $@ $? $(FLAGS)
+
+clean:
+	rm *.o
+	rm gameClient