From fd9552568d87490a6846f8cabfe62b036f07cc47 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 18 Feb 2016 18:43:20 +0100 Subject: [PATCH] CHG: First step to make my makefile better for other dev.env's These changes makes it look more like PM3 master version. The extra libs are added when MINGW is detected. --- client/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/Makefile b/client/Makefile index 56ae7de8..154828a9 100644 --- a/client/Makefile +++ b/client/Makefile @@ -11,13 +11,15 @@ CXX = g++ VPATH = ../common ../zlib OBJDIR = obj -LDLIBS = -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread -lgdi32 +LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LUALIB = ../liblua/liblua.a LDFLAGS = $(COMMON_FLAGS) -CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3 +CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3 LUAPLATFORM = generic -ifneq (,$(findstring MINGW,$(platform))) +ifneq (,$(findstring MINGW,$(platform))) + LDLIBS += -L/mingw/lib -lgdi32 + CFLAGS += -I/mingw/include CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui MOC = $(QTDIR)/bin/moc LUAPLATFORM = mingw -- 2.39.2