Make write routines take ints, floats and shorts by value not by address

[neverball] / Makefile

diff --git a/Makefile b/Makefile
index 8d437f7..88b367c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,6 @@ ifeq ($(shell uname), Darwin)
     PLATFORM := darwin
 endif
 
-# Compatibility with the old "make MINGW=1".
-ifeq ($(MINGW),1)
-    PLATFORM := mingw
-endif
-
 #------------------------------------------------------------------------------
 # Paths (packagers might want to set DATADIR and LOCALEDIR)
 
@@ -58,7 +53,7 @@ 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.
@@ -87,14 +82,6 @@ else
     ALL_CPPFLAGS += -DENABLE_NLS=1
 endif
 
-ifeq ($(ENABLE_WII),1)
-    ALL_CPPFLAGS += -DENABLE_WII=1
-endif
-
-ifeq ($(ENABLE_ODE),1)
-    ALL_CPPFLAGS += $(shell ode-config --cflags)
-endif
-
 ifeq ($(PLATFORM),darwin)
     ALL_CPPFLAGS += -I/opt/local/include
 endif
@@ -115,12 +102,12 @@ FS_LIBS := -lphysfs
 
 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
-
-ifeq ($(ENABLE_ODE),1)
-    ODE_LIBS := $(shell ode-config --libs)
 endif
 
 OGL_LIBS := -lGL -lm
@@ -150,7 +137,7 @@ ifeq ($(PLATFORM),darwin)
 endif
 
 ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
-    -lvorbisfile $(OGL_LIBS) $(ODE_LIBS)
+    -lvorbisfile $(OGL_LIBS)
 
 #------------------------------------------------------------------------------
 
@@ -207,7 +194,6 @@ BALL_OBJS := \
        share/state.o       \
        share/audio.o       \
        share/text.o        \
-       share/tilt_wii.o    \
        share/common.o      \
        share/keynames.o    \
        share/syswm.o       \
@@ -227,6 +213,7 @@ BALL_OBJS := \
        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     \
@@ -294,12 +281,17 @@ PUTT_OBJS := \
        putt/st_conf.o      \
        putt/main.o
 
-ifeq ($(ENABLE_ODE),1)
-BALL_OBJS += share/solid_sim_ode.o
-PUTT_OBJS += share/solid_sim_ode.o
-else
 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)