projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070427-3-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 7b6345e1a61c7a2631f3fc8fb1bd0dbff47cf1db..8d8df9422341556b7b0d5c2ce7a059ed7a01bba2 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-55,6
+55,7
@@
PLATFORM = unix
endif
ifeq ($(PLATFORM),macosx)
endif
ifeq ($(PLATFORM),macosx)
+EXTRA_LDFLAGS = -lstdc++
PLATFORM = unix
TARGET = sdl
endif
PLATFORM = unix
TARGET = sdl
endif
@@
-125,7
+126,7
@@
CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(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
@@
-195,7
+196,9
@@
CNFS = conf_gfx.h \
conf_e2s.c \
conf_fnt.c \
conf_g2s.c \
conf_e2s.c \
conf_fnt.c \
conf_g2s.c \
- conf_g2m.c
+ conf_g2m.c \
+ conf_var.c \
+ conf_act.c
CNFS_CMD = ../Scripts/create_element_defs.pl
CNFS_CMD = ../Scripts/create_element_defs.pl
@@
-211,7
+214,12
@@
RNDLIBS = $(LIBGAME) $(GAME_EM)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
ICONBASE = windows_icon
ifeq ($(PLATFORM),cross-win32)
-ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ifdef SPECIAL_ICON
+ICONSUFFIX = 32x32_$(SPECIAL_ICON)
+else
+ICONSUFFIX = 32x32
+endif
+ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-251,7
+259,7
@@
conf_mus.h: conf_mus.c
@$(MAKE) auto-conf
$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
@$(MAKE) auto-conf
$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM)
- @date '+"
[%Y-%m-%d %H:%M]
"' \
+ @date '+"
%Y-%m-%d %H:%M
"' \
| sed -e 's/^/#define COMPILE_DATE_STRING /' \
> $(TIMESTAMP_FILE)
| sed -e 's/^/#define COMPILE_DATE_STRING /' \
> $(TIMESTAMP_FILE)