From 60f70015f3430734542ac724e97a923a46e7708a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 14 Jul 2007 16:45:32 +0000 Subject: [PATCH] defs.mk: Push -lytools to back --- make/defs.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index a40e1e38..a4502ec5 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -341,7 +341,10 @@ endif ifeq ($(USE_YTOOLS),true) CFLAGS += -I$(MODDIR)/include CPPFLAGS += -I$(MODDIR)/include - PROJECTLIB_LDFLAGS += -lytools -L$(MODDIR)/lib + YTOOLS_LDFLAGS += -lytools -L$(MODDIR)/lib + ifeq ($(TARGET),mingw) + YTOOLS_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ + endif LD_LIB_PATH += $(MODDIR)/lib endif @@ -350,7 +353,8 @@ ifeq ($(USE_TIMER),true) CPPFLAGS += -D_USE_TIMER_ endif -LDFLAGS += -L$(LIBDIR) $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) +LDFLAGS += -L$(LIBDIR) $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(YTOOLS_LDFLAGS) + ifeq ($(USE_PROFILER),true) CFLAGS += -fprofile-arcs -ftest-coverage CPPFLAGS += -fprofile-arcs -ftest-coverage