X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=5f57dd34f0a2825547463c8a568b83322456bbb9;hb=a4e95e0a6d4b53732ea0a585be0b6df55ae41e42;hp=39029a0ce9989fe885c29bc3e43df555c1886dca;hpb=ba6af23b5637bcd5fa4e247dc336b45ba1e6fd1a;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 39029a0c..5f57dd34 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,6 +39,8 @@ WINDRES = windres
 
 CONVERT_ICON_ARGS = -transparent black -background transparent
 
+DEBUGGER = gdb -batch -ex "run" -ex "bt"
+
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
@@ -66,8 +68,9 @@ RANLIB = emranlib
 STRIP = true
 endif
 
-ifdef BUILD_DIST			# distribution build
 ifeq ($(shell uname -s),Darwin)		# compiling on Mac OS X
+DEBUGGER = lldb --batch -o "run" -k "bt" -k "quit"
+ifdef BUILD_DIST			# distribution build
 MAC_TARGET_VERSION_MIN = 10.7
 EXTRA_FLAGS_MAC = -mmacosx-version-min=$(MAC_TARGET_VERSION_MIN)
 EXTRA_CFLAGS = $(EXTRA_FLAGS_MAC)
@@ -115,11 +118,7 @@ ifdef RO_GAME_DIR			# path to read-only game data specified
 CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
 endif
 
-ifdef RW_GAME_DIR			# path to writable game data specified
-CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
-endif
-
-CONFIG = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR) $(JOYSTICK)
+CONFIG = $(CONFIG_RO_GAME_DIR) $(JOYSTICK)
 
 DEBUG = -DDEBUG -g
 
@@ -354,7 +353,7 @@ run:
 	cd .. && ./$(PROGBASE) --verbose
 
 gdb:
-	cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
+	cd .. && $(DEBUGGER) $(PROGBASE)
 
 valgrind:
 	cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out