Changeset e708305 in network-game

Timestamp:

Jun 28, 2014, 2:11:57 AM (11 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

master

Children:

a0ce8a3

Parents:

3ea1839

Message:

Client makefile works on both linux and mac

File:

• client/makefile (modified) (1 diff)

client/makefile

@@ -1 +1 @@
 CC = g++
-#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`
+FLAGS = -Wall -g
+
+UNAME_S := $(shell uname -s)
+
+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
+ifeq ($(UNAME_S),Darwin)
+        LIB_FLAGS += -framework AppKit -framework IOKit -framework OpenGL -framework AGL -framework OpenAL
+endif
+
 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