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 4bbbcca9c1c8fbb29fb4f4c0905fecf82db2c5e2..018be6a502fd61653da5628014e69533bf27633b 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-30,9
+30,11
@@
RANLIB = ranlib
ETAGS = etags
RM = rm -f
ETAGS = etags
RM = rm -f
-BMP2ICO = bmp2ico
+CONVERT = convert
WINDRES = windres
WINDRES = windres
+CONVERT_ICON_ARGS = -transparent black -background transparent
+
PROGBASE = rocksndiamonds
ifdef SPECIAL_EDITION # create special edition
PROGBASE = rocksndiamonds
ifdef SPECIAL_EDITION # create special edition
@@
-96,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
@@
-144,7
+152,7
@@
CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
CONFIG = $(CONFIG_GAME) $(JOYSTICK)
CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
CONFIG = $(CONFIG_GAME) $(JOYSTICK)
-
#
DEBUG = -DDEBUG -g
+DEBUG = -DDEBUG -g
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
@@
-218,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
@@
-232,15
+240,19
@@
GAME_SP_DIR = game_sp
GAME_SP = $(GAME_SP_DIR)/game_sp.a
RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
GAME_SP = $(GAME_SP_DIR)/game_sp.a
RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP)
+AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
ICONBASE = windows_icon
ICONBASE = windows_icon
+ICON_BASEPATH = ../Special/Icons/windows_icons
ifeq ($(PLATFORM),cross-win32)
ifdef SPECIAL_EDITION
ifeq ($(PLATFORM),cross-win32)
ifdef SPECIAL_EDITION
-ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+# ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+ICON_PATH = $(ICON_BASEPATH)/$(SPECIAL_EDITION)
else
else
-ICONSUFFIX = 32x32
+# ICONSUFFIX = 32x32
+ICON_PATH = $(ICON_BASEPATH)/default
endif
endif
-ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
+
#
ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-249,7
+261,7
@@
endif
# build targets
# -----------------------------------------------------------------------------
# build targets
# -----------------------------------------------------------------------------
-all: libgame_dir game_em_dir game_sp_dir $(PROGNAME)
+all:
$(AUTOCONF)
libgame_dir game_em_dir game_sp_dir $(PROGNAME)
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
$(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
@@
-290,7
+302,8
@@
$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
> $(TIMESTAMP_FILE)
$(ICON):
> $(TIMESTAMP_FILE)
$(ICON):
- $(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+# $(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
+ $(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o:
echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o:
@@
-320,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