BUILD := $(shell head -n1 BUILD 2> /dev/null || echo release)
ifeq ($(BUILD),release)
- VERSION := 1.5.3
+ VERSION := 1.5.5
else
VERSION := $(shell sh scripts/version.sh)
ifeq ($(VERSION),unknown)
- VERSION := 1.5.3-dev
+ VERSION := 1.5.5-dev
endif
endif
#------------------------------------------------------------------------------
# Provide a target system hint for the Makefile.
+# Recognized PLATFORM values: darwin, mingw.
ifeq ($(shell uname), Darwin)
- DARWIN := 1
+ PLATFORM := darwin
endif
-# MINGW=1 also supported.
-
#------------------------------------------------------------------------------
# Paths (packagers might want to set DATADIR and LOCALEDIR)
DATADIR := ./data
LOCALEDIR := ./locale
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
USERDIR := Neverball
endif
# Compiler...
-ifeq ($(ENABLE_WII),1)
+ifeq ($(ENABLE_TILT),wii)
# -std=c99 because we need isnormal and -fms-extensions because
# libwiimote headers make heavy use of the "unnamed fields" GCC
# extension.
ALL_CPPFLAGS += -DENABLE_NLS=1
endif
-ifeq ($(ENABLE_WII),1)
- ALL_CPPFLAGS += -DENABLE_WII=1
-endif
-
-ifdef DARWIN
+ifeq ($(PLATFORM),darwin)
ALL_CPPFLAGS += -I/opt/local/include
endif
INTL_LIBS :=
-ifeq ($(ENABLE_WII),1)
+ifeq ($(ENABLE_TILT),wii)
TILT_LIBS := -lcwiimote -lbluetooth
+else
+ifeq ($(ENABLE_TILT),loop)
+ TILT_LIBS := -lusb-1.0 -lfreespace
+endif
endif
OGL_LIBS := -lGL -lm
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
ifneq ($(ENABLE_NLS),0)
INTL_LIBS := -lintl
endif
OGL_LIBS := -lopengl32 -lm
endif
-ifdef DARWIN
+ifeq ($(PLATFORM),darwin)
ifneq ($(ENABLE_NLS),0)
INTL_LIBS := -lintl
endif
BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-ifdef DARWIN
+ifeq ($(PLATFORM),darwin)
BASE_LIBS += -L/opt/local/lib
endif
#------------------------------------------------------------------------------
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
EXT := .exe
endif
BALL_TARG := neverball$(EXT)
PUTT_TARG := neverputt$(EXT)
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
MAPC := $(WINE) ./$(MAPC_TARG)
else
MAPC := ./$(MAPC_TARG)
share/image.o \
share/solid.o \
share/solid_gl.o \
- share/solid_phys.o \
+ share/solid_cmd.o \
+ share/solid_all.o \
share/part.o \
share/back.o \
share/geom.o \
share/state.o \
share/audio.o \
share/text.o \
- share/tilt.o \
share/common.o \
share/keynames.o \
share/syswm.o \
share/fs_jpg.o \
share/fs_rwops.o \
share/fs_ov.o \
+ share/sync.o \
ball/hud.o \
ball/game_common.o \
ball/game_client.o \
ball/game_server.o \
ball/game_proxy.o \
+ ball/game_draw.o \
ball/score.o \
ball/level.o \
ball/progress.o \
share/image.o \
share/solid.o \
share/solid_gl.o \
- share/solid_phys.o \
+ share/solid_cmd.o \
+ share/solid_all.o \
share/part.o \
share/geom.o \
share/ball.o \
share/fs_ov.o \
share/dir.o \
share/array.o \
+ share/sync.o \
putt/hud.o \
putt/game.o \
putt/hole.o \
putt/st_conf.o \
putt/main.o
-ifdef MINGW
+BALL_OBJS += share/solid_sim_sol.o
+PUTT_OBJS += share/solid_sim_sol.o
+
+ifeq ($(ENABLE_TILT),wii)
+BALL_OBJS += share/tilt_wii.o
+else
+ifeq ($(ENABLE_TILT),loop)
+BALL_OBJS += share/tilt_loop.o
+else
+BALL_OBJS += share/tilt_null.o
+endif
+endif
+
+ifeq ($(PLATFORM),mingw)
BALL_OBJS += neverball.ico.o
PUTT_OBJS += neverputt.ico.o
endif
# Work around some extremely helpful sdl-config scripts.
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
$(MAPC_TARG) : ALL_CPPFLAGS := $(ALL_CPPFLAGS) -Umain
endif
#------------------------------------------------------------------------------
-ifdef MINGW
+ifeq ($(PLATFORM),mingw)
#------------------------------------------------------------------------------