Changeset 34bd549 in network-game for client

Timestamp:

Jun 19, 2014, 1:34:15 AM (11 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

3ea1839

Parents:

883bb5d

Message:

Make client compile on a Mac

Location:

client

Files:

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

client/Client/main.cpp

@@ -11 +11 @@
    #include <netdb.h>
    #include <cstring>
+#elif defined MAC
+   #include <netdb.h>
 #endif
 
@@ -171 +173 @@
       font = al_load_ttf_font("../pirulen.ttf", 12, 0);
    #elif defined LINUX
+      font = al_load_ttf_font("pirulen.ttf", 12, 0);
+   #elif defined MAC
       font = al_load_ttf_font("pirulen.ttf", 12, 0);
    #endif
@@ -782 +786 @@
                #elif defined LINUX
                   game = new Game(gameName, "../data/map.txt", &msgProcessor);
+               #elif defined MAC
+                  game = new Game(gameName, "../data/map.txt", &msgProcessor);
                #endif
 
@@ -1303 +1309 @@
 
    msgProcessor.sendMessage(&msgTo, &server);
+   cout << "Sent CREATE_GAME message" << endl;
 }
 

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`
+#LIB_FLAGS = `pkg-config --cflags --libs --static allegro-static-5.0 allegro_main-static-5.0 allegro_ttf-static-5.0 allegro_primitives-static-5.0`
+# osx needs to link against some extra libraries
+LIB_FLAGS = `pkg-config --cflags --libs --static allegro-static-5.0 allegro_main-static-5.0 allegro_ttf-static-5.0 allegro_primitives-static-5.0` -framework AppKit -framework IOKit -framework OpenGL -framework AGL -framework OpenAL
 FLAGS = -Wall -g
 COMMON_PATH = ../common