Changeset ca44f82 in network-game for client/makefile

Timestamp:

Feb 24, 2013, 1:28:32 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7b43385

Parents:

3a79253 (diff), 8f85180 (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:

Updated files to correctly compile on Windows

File:

• client/makefile (modified) (1 diff)

client/makefile

@@ -3 +3 @@
 FLAGS = $(LIB_FLAGS)
 COMMON_PATH = ../common
-DEPENDENCIES = Message.o Player.o chat.o GuiComponent.o Window.o Textbox.o Button.o
+DEPENDENCIES = Common.o Message.o Player.o chat.o GuiComponent.o Window.o Textbox.o Button.o
 
 gameClient : Client/main.cpp $(DEPENDENCIES)
         $(CC) -o $@ $+ $(FLAGS)
+
+Common.o : $(COMMON_PATH)/Common.cpp
+        $(CC) -c -o $@ $? $(FLAGS)
 
 Message.o : $(COMMON_PATH)/Message.cpp