Changeset 8aed9c0 in network-game

Timestamp:

Dec 28, 2013, 2:21:46 PM (11 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

bcfd99a

Parents:

360c0f1

Message:

Client compiles under linux

Location:

client

Files:

• .gitignore (modified) (1 diff)
• Client/main.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)

client/.gitignore

@@ -8 +8 @@
 allegro.log
 client.log
+*.o

client/Client/main.cpp

@@ -23 +23 @@
 #include <map>
 #include <vector>
+#include <stdexcept>
 
 #include <allegro5/allegro.h>
@@ -880 +881 @@
                cout << "Received a JOIN_GAME_SUCCESS message" << endl;
 
-               string gameName(msg.buffer);         
-               game = new Game(gameName, "../../data/map.txt");
+               string gameName(msg.buffer);
+
+               #if defined WINDOWS
+                  game = new Game(gameName, "../../data/map.txt");
+               #elif defined LINUX
+                  game = new Game(gameName, "../data/map.txt");
+               #endif
+
                cout << "Game name: " << gameName << endl;
 

client/makefile

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