Changeset c51da03 in network-game for client/makefile

Timestamp:

Jan 26, 2014, 9:46:43 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c991530

Parents:

5c7f28d (diff), 1e250bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

File:

• client/makefile (modified) (2 diffs)

client/makefile

@@ -1 +1 @@
 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)
+FLAGS = -Wall
 COMMON_PATH = ../common
 DEPENDENCIES = Common.o MessageContainer.o MessageProcessor.o Player.o WorldMap.o Projectile.o Game.o GameRender.o GameSummary.o chat.o GuiComponent.o Window.o Textbox.o Button.o RadioButtonList.o TextLabel.o
 
 gameClient : Client/main.cpp $(DEPENDENCIES)
-        $(CC) -o $@ $+ $(FLAGS)
+        $(CC) -o $@ $+ $(FLAGS) $(LIB_FLAGS)
+
+%.o : Client/%.cpp
+        $(CC) -c -o $@ $? $(FLAGS)
 
 Common.o : $(COMMON_PATH)/Common.cpp
@@ -32 +35 @@
         $(CC) -c -o $@ $? $(FLAGS)
 
-%.o : Client/%.cpp
-        $(CC) -c -o $@ $? $(FLAGS)
-
 clean:
         rm *.o