Sophie

Sophie

distrib > Mageia > cauldron > i586 > by-pkgid > 52af18b8bf0649cc1161f4565f80fb68 > files > 4

brogue-1.7.5-1.mga7.src.rpm

Index: brogue-1.7.5/Makefile
===================================================================
--- brogue-1.7.5/Makefile
+++ brogue-1.7.5/Makefile	2018-10-01 14:35:09.669206040 +0200
@@ -1,6 +1,7 @@
 
 SDL_FLAGS = `sdl-config --cflags` `sdl-config --libs`
 LIBTCODDIR=src/libtcod-1.5.2
+LIBTCOD_LIBS=-lm -ldl -lX11 -lpthread -lz -lGL
 CFLAGS=-Isrc/brogue -Isrc/platform -Wall -Wno-parentheses ${DEFINES}
 RELEASENAME=brogue-1.7.4
 LASTTARGET := $(shell ./brogue --target)
@@ -45,7 +46,7 @@
 
 TCOD_DEF = -DBROGUE_TCOD -I$(LIBTCODDIR)/include
 TCOD_DEP = ${LIBTCODDIR}
-TCOD_LIB = -L. -L${LIBTCODDIR} ${SDL_FLAGS} -ltcod -Wl,-rpath,.
+TCOD_LIB = -L. -L${LIBTCODDIR} ${SDL_FLAGS} -ltcod $(LIBTCOD_LIBS)
 
 CURSES_DEF = -DBROGUE_CURSES
 CURSES_LIB = -lncurses -lm
Index: brogue-1.7.5/src/libtcod-1.5.2/Makefile
===================================================================
--- brogue-1.7.5/src/libtcod-1.5.2/Makefile
+++ brogue-1.7.5/src/libtcod-1.5.2/Makefile	2018-10-01 14:36:14.782494038 +0200
@@ -17,7 +17,7 @@
 LIBS=$(ZLIB_LIBS) $(SDL_LIBS) $(OPENGL_LIB) -lm -ldl -lX11 -lpthread -lz
 
 CFLAGS=$(FLAGS) -I$(INCDIR) -I$(INCDIR)/gui -Wall $(SDL_FLAGS) -fPIC
-TEMP=/tmp
+TEMP=build
 CC=gcc
 CPP=g++
 .SUFFIXES: a .o .h .c
@@ -135,8 +135,8 @@
 	mkdir -p $@
 
 
-libtcod.a : $(LIBOBJS_C_DEBUG)
-	ar r $@ $(LIBOBJS_C_DEBUG)
+libtcod.a : $(LIBOBJS_C_RELEASE)
+	ar r $@ $(LIBOBJS_C_RELEASE)
 
 
 libtcodxx.a : $(LIBOBJS_CPP_DEBUG)