projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20071012-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 86fcd3b050f66870f9c6e2c753b2bfcad6fe41dc..19d54bb0ab92144f1c5062e215fbfde3dc3c9fe3 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-10,7
+10,7
@@
.EXPORT_ALL_VARIABLES:
.EXPORT_ALL_VARIABLES:
-ifndef PLATFORM
# no platform specified
-- try auto detection
+ifndef PLATFORM
# unknown platform
-- try auto detection
ifdef COMSPEC
PLATFORM = msdos
else
ifdef COMSPEC
PLATFORM = msdos
else
@@
-18,7
+18,7
@@
PLATFORM = unix
endif
endif
endif
endif
-ifdef X11_PATH
# path to X11 specified by
top level Makefile
+ifdef X11_PATH
# path to X11 from
top level Makefile
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
X11_INCL = -I$(XINC_PATH)
XINC_PATH = $(X11_PATH)/include
XLIB_PATH = $(X11_PATH)/lib
X11_INCL = -I$(XINC_PATH)
@@
-28,39
+28,36
@@
endif
AR = ar
RANLIB = ranlib
ETAGS = etags
AR = ar
RANLIB = ranlib
ETAGS = etags
+RM = rm -f
BMP2ICO = bmp2ico
WINDRES = windres
BMP2ICO = bmp2ico
WINDRES = windres
-ifeq ($(PLATFORM),msdos) # MS-DOS native compiling
-
-RM = del
-
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
+PROGBASE = rocksndiamonds
-SYS_CFLAGS = -DTARGET_X11
-SYS_LDFLAGS = -s -lalleg
+ifdef SPECIAL_EDITION # create special edition
+PROGBASE = $(SPECIAL_EDITION)
+endif
-else # Unix or cross-compiling for MS-DOS and Win32
+PROGNAME = ../$(PROGBASE)
-RM = rm -f
-PROGBASE = rocksndiamonds
-PROGNAME = ../$(PROGBASE)
+# -----------------------------------------------------------------------------
+# configuring platform
+# -----------------------------------------------------------------------------
-ifeq ($(PLATFORM),solaris)
+ifeq ($(PLATFORM),solaris)
# native compiling to Solaris
EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
PLATFORM = unix
endif
EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
PLATFORM = unix
endif
-ifeq ($(PLATFORM),macosx)
+ifeq ($(PLATFORM),macosx)
# native compiling to Mac OS X
EXTRA_LDFLAGS = -lstdc++
PLATFORM = unix
TARGET = sdl
endif
EXTRA_LDFLAGS = -lstdc++
PLATFORM = unix
TARGET = sdl
endif
-ifeq ($(PLATFORM),os2)
+ifeq ($(PLATFORM),os2)
# native compiling to OS/2
RANLIB = echo
PROGNAME = ../$(PROGBASE).exe
EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
RANLIB = echo
PROGNAME = ../$(PROGBASE).exe
EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
@@
-69,63
+66,84
@@
PLATFORM = unix
TARGET = x11
endif
TARGET = x11
endif
-ifeq ($(PLATFORM),unix)
+ifeq ($(PLATFORM),unix)
# native compiling to Unix (generic)
PROFILING_FLAGS = -pg
endif
PROFILING_FLAGS = -pg
endif
-ifeq ($(PLATFORM),cross-msdos)
+ifeq ($(PLATFORM),cross-win32) # cross-compiling to Windows
+PROGNAME = ../$(PROGBASE).exe
+EXTRA_LDFLAGS = -lshfolder -lwsock32
+TARGET = sdl
+endif
+
+ifeq ($(PLATFORM),cross-msdos) # cross-compiling to MS-DOS
PROGBASE = rocks
PROGNAME = ../$(PROGBASE).exe
TARGET = allegro
endif
PROGBASE = rocks
PROGNAME = ../$(PROGBASE).exe
TARGET = allegro
endif
-ifeq ($(PLATFORM),
cross-win32)
-EXTRA_LDFLAGS = -lshfolder -lwsock32
+ifeq ($(PLATFORM),
msdos) # native compiling to MS-DOS
+PROGBASE = rocks
PROGNAME = ../$(PROGBASE).exe
PROGNAME = ../$(PROGBASE).exe
-TARGET = sdl
+SYS_CFLAGS = -DTARGET_X11
+SYS_LDFLAGS = -s -lalleg
+RM = del
endif
endif
-ifeq ($(TARGET),x11)
+
+# -----------------------------------------------------------------------------
+# configuring target
+# -----------------------------------------------------------------------------
+
+ifeq ($(TARGET),x11) # compiling for X11 target
SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
SYS_LDFLAGS = $(X11_LIBS)
endif
SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
SYS_LDFLAGS = $(X11_LIBS)
endif
-ifeq ($(TARGET),sdl)
+ifeq ($(TARGET),sdl)
# compiling for SDL target
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
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
-ifeq ($(TARGET),sdl-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_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
endif
-ifeq ($(TARGET),allegro)
+ifeq ($(TARGET),allegro)
# compiling for Allegro target
SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
SYS_LDFLAGS = -lalleg
endif
SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
SYS_LDFLAGS = -lalleg
endif
-endif # (PLATFORM != msdos)
+# -----------------------------------------------------------------------------
+# configuring compile-time definitions
+# -----------------------------------------------------------------------------
-ifdef RO_GAME_DIR # path to read-only game data specified
+ifdef RO_GAME_DIR
# path to read-only game data specified
CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
endif
CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
endif
-ifdef RW_GAME_DIR # path to writable game data specified
+ifdef RW_GAME_DIR
# path to writable game data specified
CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
endif
CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
endif
-ifdef SCORE_ENTRIES
# number of score entries per player specified
+ifdef SCORE_ENTRIES
# number of score entries per player
CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
endif
CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
endif
-CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+ifdef SPECIAL_EDITION
+ifeq ($(SPECIAL_EDITION),rnd_jue) # create special edition
+CONFIG_SPECIAL = -DCREATE_SPECIAL_EDITION -DCREATE_SPECIAL_EDITION_RND_JUE
+endif
+endif
+CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
-CONFIG = $(CONFIG_GAME
_DIR) $(CONFIG_SCORE_ENTRIES
) $(JOYSTICK)
+CONFIG = $(CONFIG_GAME) $(JOYSTICK)
DEBUG = -DDEBUG -g
# PROFILING = $(PROFILING_FLAGS)
DEBUG = -DDEBUG -g
# PROFILING = $(PROFILING_FLAGS)
@@
-136,9
+154,9
@@
OPTIONS = $(DEBUG) -Wall # only for debugging purposes
# OPTIONS = -O3 -Wall -ansi -pedantic
# OPTIONS = -O3 -Wall
# OPTIONS = -O3
# OPTIONS = -O3 -Wall -ansi -pedantic
# OPTIONS = -O3 -Wall
# OPTIONS = -O3
-# OPTIONS = -DSYSV -Ae
# may be needed for HP-UX
+# OPTIONS = -DSYSV -Ae # may be needed for HP-UX
-ifdef BUILD_DIST
# distribution build
+ifdef BUILD_DIST # distribution build
OPTIONS = -O3 -Wall
endif
OPTIONS = -O3 -Wall
endif
@@
-196,7
+214,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
@@
-212,7
+232,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_EDITION
+ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
+else
+ICONSUFFIX = 32x32
+endif
+ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
ICON = $(ICONBASE).o
endif
ICON = $(ICONBASE).o
endif
@@
-281,6
+306,20
@@
clean-bin:
clean: clean-obj clean-ico clean-bin
clean: clean-obj clean-ico clean-bin
+# -----------------------------------------------------------------------------
+# run and test targets
+# -----------------------------------------------------------------------------
+
+run: all
+ $(PROGNAME) --verbose
+
+gdb: all
+ gdb -batch -x ../GDB_COMMANDS $(PROGNAME)
+
+valgrind: all
+ valgrind -v --leak-check=yes $(PROGNAME) 2> ../valgrind.out
+
+
# -----------------------------------------------------------------------------
# development only
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
# development only
# -----------------------------------------------------------------------------