fixed wrong linking order of libraries in Makefile

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 6674b5ae01f6114ad86ad64888da32819591ae36..6e74c8e141318305044f53842fc572a3ddebad99 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -156,6 +156,14 @@ endif
 CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
 LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
 
+# !!! DEPENDENCY TO GLIB SHOULD BE REMOVED AGAIN !!!
+GLIB_CFLAGS  := $(shell pkg-config --cflags glib-2.0)
+GLIB_LDFLAGS := $(shell pkg-config --libs   glib-2.0)
+
+CFLAGS  := $(CFLAGS)  $(GLIB_CFLAGS)
+LDFLAGS := $(LDFLAGS) $(GLIB_LDFLAGS)
+# !!! DEPENDENCY TO GLIB SHOULD BE REMOVED AGAIN !!!
+
 
 SRCS = main.c          \
        conf_gfx.c      \
@@ -247,7 +255,7 @@ GAME_SP = $(GAME_SP_DIR)/game_sp.a
 GAME_MM_DIR = game_mm
 GAME_MM = $(GAME_MM_DIR)/game_mm.a
 
-RNDLIBS = $(LIBGAME) $(GAME_BD) $(GAME_EM) $(GAME_SP) $(GAME_MM)
+RNDLIBS = $(GAME_BD) $(GAME_EM) $(GAME_SP) $(GAME_MM) $(LIBGAME)
 AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
@@ -405,6 +413,14 @@ depend:
        $(MAKE) -C $(GAME_MM_DIR) depend
        for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
+depend-clean:
+       $(MAKE) -C $(LIBGAME_DIR) depend-clean
+       $(MAKE) -C $(GAME_BD_DIR) depend-clean
+       $(MAKE) -C $(GAME_EM_DIR) depend-clean
+       $(MAKE) -C $(GAME_SP_DIR) depend-clean
+       $(MAKE) -C $(GAME_MM_DIR) depend-clean
+       $(RM) .depend
+
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif