rnd-20131120-1-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 9820c4de195670fd162259a870b40b1b3e58470c..b8c53054d0ff4e4378443e1ad877ffa39c9eb3a6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,7 +110,7 @@ endif
 
 ifeq ($(TARGET),sdl-static)            # compiling for SDL target (static)
 SYS_CFLAGS  = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 
@@ -220,7 +220,7 @@ CNFS =      conf_gfx.h      \
        conf_var.c      \
        conf_act.c
 
-CNFS_CMD = ../Scripts/create_element_defs.pl
+CNFS_CMD = ../build-scripts/create_element_defs.pl
 
 TIMESTAMP_FILE = conftime.h
 
@@ -327,13 +327,13 @@ clean: clean-obj clean-ico clean-bin
 # run and test targets
 # -----------------------------------------------------------------------------
 
-run: all
+run:
        cd .. && ./$(PROGBASE) --verbose
 
-gdb: all
+gdb:
        cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
 
-valgrind: all
+valgrind:
        cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out