projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001128-1-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index 93f9d3d3de9894d0fa172d8ec6a69442c27d0326..cc8e1df0439b9abf95affa76278759f823248dc1 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,11
+1,11
@@
#=============================================================================#
#=============================================================================#
-# Makefile for Rocks'n'Diamonds
1.4.0
#
-# (c) 1995-
1999 Holger Schemel, aeglos@valinor.owl.de
#
+# Makefile for Rocks'n'Diamonds
#
+# (c) 1995-
2000 Holger Schemel, info@artsoft.org
#
#=============================================================================#
ifndef PLATFORM # platform not specified -- try auto detection
ifdef COMSPEC
#=============================================================================#
ifndef PLATFORM # platform not specified -- try auto detection
ifdef COMSPEC
-PLATFORM = dos
+PLATFORM =
ms
dos
else
PLATFORM = unix
endif
else
PLATFORM = unix
endif
@@
-19,58
+19,54
@@
X11_LIBS = -L$(XLIB_PATH)
endif
endif
-ifeq ($(PLATFORM),
dos) # DOS / Windows
+ifeq ($(PLATFORM),
msdos) # MS-DOS native compiling
RM = del
PROGNAME = ../rocks.exe
RM = del
PROGNAME = ../rocks.exe
-LIBS = -s -lm -lalleg
-else # Unix
+SYS_CFLAGS = -DTARGET_X11
+SYS_LDFLAGS = -s -lalleg
+
+else # Unix or cross-compiling for MS-DOS and Win32
RM = rm -f
PROGNAME = ../rocksndiamonds
ifeq ($(PLATFORM),solaris)
RM = rm -f
PROGNAME = ../rocksndiamonds
ifeq ($(PLATFORM),solaris)
-EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH)
+EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
+PLATFORM = unix
endif
endif
-ifeq ($(PLATFORM),windows)
-PROGNAME = ../rocksndiamonds.exe
-TARGET = sdl
-else
+ifeq ($(PLATFORM),unix)
PROFILING = -pg
endif
PROFILING = -pg
endif
-ifeq ($(TARGET),sdl)
-USE_SDL = true
-else
-USE_SDL = false
+ifeq ($(PLATFORM),cross-msdos)
+PROGNAME = ../rocks.exe
+TARGET = allegro
endif
endif
-ifeq ($(USE_SDL_OLD_LIBS),true)
-SDL_EXTRA_LIBS = -lIMG -lmixer
-else
-SDL_EXTRA_LIBS = -lSDL_image -lSDL_mixer
+ifeq ($(PLATFORM),cross-win32)
+PROGNAME = ../rocksndiamonds.exe
+TARGET = sdl
endif
endif
-SDL_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags)
-SDL_LDFLAGS := $(SDL_EXTRA_LIBS) $(shell sdl-config --libs)
-
-X11_CFLAGS = -DUSE_X11_LIBRARY $(X11_INCL)
-X11_LDFLAGS = $(X11_LIBS) -lX11
+ifeq ($(TARGET),x11)
+SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
+SYS_LDFLAGS = $(X11_LIBS) -lX11
+endif
-ifeq ($(USE_SDL),true)
-SYS_CFLAGS = $(SDL_CFLAGS)
-SYS_LDFLAGS = $(SDL_LDFLAGS)
-else
-SYS_CFLAGS = $(X11_CFLAGS)
-SYS_LDFLAGS = $(X11_LDFLAGS)
+ifeq ($(TARGET),sdl)
+SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
+SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs)
endif
endif
-INCL = $(SYS_CFLAGS)
-LIBS = $(SYS_LDFLAGS) $(EXTRA_LIBS) -lm
+ifeq ($(TARGET),allegro)
+SYS_CFLAGS = -DTARGET_X11 -I$(CROSS_PATH_MSDOS)/include
+SYS_LDFLAGS = -lalleg
+endif
-endif # (PLATFORM != dos)
+endif # (PLATFORM !=
ms
dos)
ifdef RO_GAME_DIR # path to read-only game data specified
ifdef RO_GAME_DIR # path to read-only game data specified
@@
-88,7
+84,7
@@
endif
CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
-CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(
SOUNDS) $(
JOYSTICK)
+CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
DEBUG = -DDEBUG -g
OPTIONS = $(DEBUG) -Wall # only for debugging purposes
DEBUG = -DDEBUG -g
OPTIONS = $(DEBUG) -Wall # only for debugging purposes
@@
-97,10
+93,10
@@
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
-# SYSTEM = -DSYSV -Ae # may be needed for HP-UX
-
-CFLAGS = $(OPTIONS) $(SYSTEM) $(SYS_CFLAGS) $(CONFIG)
+CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
+LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
SRCS = main.c \
init.c \
SRCS = main.c \
init.c \
@@
-153,7
+149,7
@@
OBJS = main.o \
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
all: $(PROGNAME)
$(PROGNAME): $(OBJS)
- $(CC) $(PROFILING) $(OBJS) $(L
IB
S) -o $(PROGNAME)
+ $(CC) $(PROFILING) $(OBJS) $(L
DFLAG
S) -o $(PROGNAME)
.c.o:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
.c.o:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c