Changeset 3f5616f in network-game for client

Timestamp:

Dec 24, 2012, 10:13:43 PM (12 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

baaf6c8

Parents:

cdb4bec

git-author:

Dmitry Portnoy <dportnoy@…> (12/24/12 22:11:06)

git-committer:

Dmitry Portnoy <dmp1488@…> (12/24/12 22:13:43)

Message:

Changed the client makefile to use static linking for the allegro library and fixed a bug where button and textbox borders would display incorrectly on Linux

Location:

client

Files:

• Client/Button.cpp (modified) (1 diff)
• Client/Textbox.cpp (modified) (1 diff)
• makefile (modified) (1 diff)

client/Client/Button.cpp

@@ -20 +20 @@
 
    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));

client/Client/Textbox.cpp

@@ -68 +68 @@
 
    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));

client/makefile

@@ -1 @@
-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