projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20131209-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 9820c4de195670fd162259a870b40b1b3e58470c..018be6a502fd61653da5628014e69533bf27633b 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-98,19
+98,25
@@
endif
# -----------------------------------------------------------------------------
ifeq ($(TARGET),x11) # compiling for X11 target
# -----------------------------------------------------------------------------
ifeq ($(TARGET),x11) # compiling for X11 target
-SYS_CFLAGS
= -DTARGET_X11 $(X11_INCL)
+SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
SYS_LDFLAGS = $(X11_LIBS)
endif
ifeq ($(TARGET),sdl) # compiling for SDL target
SYS_LDFLAGS = $(X11_LIBS)
endif
ifeq ($(TARGET),sdl) # compiling for SDL target
-SYS_CFLAGS
= -DTARGET_SDL $(shell sdl-config --cflags)
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
endif
SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
endif
+ifeq ($(TARGET),sdl2) # compiling for SDL2 target
+SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2
+SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --libs)
+endif
+
ifeq ($(TARGET),sdl-static) # compiling for SDL target (static)
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
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
-lmikmod
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
@@
-220,7
+226,7
@@
CNFS = conf_gfx.h \
conf_var.c \
conf_act.c
conf_var.c \
conf_act.c
-CNFS_CMD = ../
S
cripts/create_element_defs.pl
+CNFS_CMD = ../
build-s
cripts/create_element_defs.pl
TIMESTAMP_FILE = conftime.h
TIMESTAMP_FILE = conftime.h
@@
-327,13
+333,13
@@
clean: clean-obj clean-ico clean-bin
# run and test targets
# -----------------------------------------------------------------------------
# run and test targets
# -----------------------------------------------------------------------------
-run:
all
+run:
cd .. && ./$(PROGBASE) --verbose
cd .. && ./$(PROGBASE) --verbose
-gdb:
all
+gdb:
cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
cd .. && gdb -batch -x GDB_COMMANDS ./$(PROGBASE)
-valgrind:
all
+valgrind:
cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out
cd .. && valgrind -v --leak-check=yes ./$(PROGBASE) 2> valgrind.out