X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=7a128e75ed18b79b4e3f97cf34ff6abafe2d0479;hb=4ed68b54ed9bed72d87eac4dd7b117fc4b8022d6;hp=6f586e0f8082a4bfc92e9613c5113bd286acfb41;hpb=bddf6c22480ed7f7fca83b7d6c4f9dc10d19f57a;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index 6f586e0f..7a128e75 100644 --- a/src/Makefile +++ b/src/Makefile @@ -156,14 +156,6 @@ 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 \ @@ -255,7 +247,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