ball/util: clean up duplicate code
[neverball] / Makefile
index 09c5ac6..1811809 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ endif
 #------------------------------------------------------------------------------
 # Optional flags (CFLAGS, CPPFLAGS, ...)
 
-ifeq ($(ENABLE_WII),1)
-    # libwiimote is NOT ANSI compliant
-    CFLAGS := -O2
+ifeq ($(DEBUG),1)
+    CFLAGS   := -g
+    CPPFLAGS :=
 else
-    #CFLAGS := -Wall -g -ansi -pedantic
-    CFLAGS := -Wall -O2 -ansi -pedantic
+    CFLAGS   := -O2
+    CPPFLAGS := -DNDEBUG
 endif
 
 #------------------------------------------------------------------------------
@@ -28,11 +28,22 @@ endif
 
 # Compiler...
 
-ALL_CFLAGS := $(CFLAGS)
+SSE_CFLAGS := $(shell env CC="$(CC)" sh scripts/get-sse-cflags.sh)
+
+ifeq ($(ENABLE_WII),1)
+    # -std=c99 because we need isnormal and -fms-extensions because
+    # libwiimote headers make heavy use of the "unnamed fields" GCC
+    # extension.
+
+    ALL_CFLAGS := -Wall -std=c99 -pedantic -fms-extensions \
+       $(SSE_CFLAGS) $(CFLAGS)
+else
+    ALL_CFLAGS := -Wall -ansi -pedantic $(SSE_CFLAGS) $(CFLAGS)
+endif
 
 # Preprocessor...
 
-SDL_CPPFLAGS := $(shell sdl-config --cflags)
+SDL_CPPFLAGS := $(shell sdl-config --cflags) -U_GNU_SOURCE
 PNG_CPPFLAGS := $(shell libpng-config --cflags)
 
 ALL_CPPFLAGS := $(SDL_CPPFLAGS) $(PNG_CPPFLAGS) -Ishare \
@@ -59,6 +70,7 @@ ALL_CPPFLAGS += $(CPPFLAGS)
 
 SDL_LIBS := $(shell sdl-config --libs)
 PNG_LIBS := $(shell libpng-config --libs)
+FS_LIBS := -lphysfs
 
 # The  non-conditionalised values  below  are specific  to the  native
 # system. The native system of this Makefile is Linux (or GNU+Linux if
@@ -75,7 +87,7 @@ OGL_LIBS := -lGL -lm
 
 ifdef MINGW
     ifneq ($(ENABLE_NLS),0)
-        INTL_LIBS := -lintl -liconv
+        INTL_LIBS := -lintl
     endif
 
     TILT_LIBS :=
@@ -84,14 +96,14 @@ endif
 
 ifdef DARWIN
     ifneq ($(ENABLE_NLS),0)
-        INTL_LIBS := -lintl -liconv
+        INTL_LIBS := -lintl
     endif
 
     TILT_LIBS :=
     OGL_LIBS  := -framework OpenGL
 endif
 
-BASE_LIBS := -ljpeg $(PNG_LIBS)
+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
 
 ifdef DARWIN
     BASE_LIBS += -L/opt/local/lib
@@ -111,7 +123,7 @@ BALL_TARG := neverball$(EXT)
 PUTT_TARG := neverputt$(EXT)
 
 ifdef MINGW
-    MAPC := wine ./$(MAPC_TARG)
+    MAPC := $(WINE) ./$(MAPC_TARG)
 else
     MAPC := ./$(MAPC_TARG)
 endif
@@ -125,6 +137,12 @@ MAPC_OBJS := \
        share/solid.o       \
        share/binary.o      \
        share/base_config.o \
+       share/common.o      \
+       share/fs.o          \
+       share/fs_png.o      \
+       share/fs_jpg.o      \
+       share/dir.o         \
+       share/array.o       \
        share/mapc.o
 BALL_OBJS := \
        share/lang.o        \
@@ -134,28 +152,45 @@ BALL_OBJS := \
        share/image.o       \
        share/solid.o       \
        share/solid_gl.o    \
+       share/solid_phys.o  \
        share/part.o        \
        share/back.o        \
        share/geom.o        \
+       share/item.o        \
        share/ball.o        \
        share/gui.o         \
        share/base_config.o \
        share/config.o      \
+       share/video.o       \
        share/binary.o      \
        share/state.o       \
        share/audio.o       \
        share/text.o        \
-       share/sync.o        \
        share/tilt.o        \
        share/common.o      \
+       share/keynames.o    \
+       share/syswm.o       \
+       share/list.o        \
+       share/queue.o       \
+       share/cmd.o         \
+       share/array.o       \
+       share/dir.o         \
+       share/fs.o          \
+       share/fs_png.o      \
+       share/fs_jpg.o      \
+       share/fs_rwops.o    \
+       share/fs_ov.o       \
        ball/hud.o          \
-       ball/mode.o         \
-       ball/game.o         \
+       ball/game_common.o  \
+       ball/game_client.o  \
+       ball/game_server.o  \
+       ball/game_proxy.o   \
        ball/score.o        \
        ball/level.o        \
-       ball/levels.o       \
+       ball/progress.o     \
        ball/set.o          \
        ball/demo.o         \
+       ball/demo_dir.o     \
        ball/util.o         \
        ball/st_conf.o      \
        ball/st_demo.o      \
@@ -174,6 +209,7 @@ BALL_OBJS := \
        ball/st_name.o      \
        ball/st_shared.o    \
        ball/st_pause.o     \
+       ball/st_ball.o      \
        ball/main.o
 PUTT_OBJS := \
        share/lang.o        \
@@ -183,18 +219,29 @@ PUTT_OBJS := \
        share/image.o       \
        share/solid.o       \
        share/solid_gl.o    \
+       share/solid_phys.o  \
        share/part.o        \
        share/geom.o        \
        share/ball.o        \
        share/back.o        \
        share/base_config.o \
        share/config.o      \
+       share/video.o       \
        share/binary.o      \
        share/audio.o       \
        share/state.o       \
        share/gui.o         \
        share/text.o        \
-       share/sync.o        \
+       share/common.o      \
+       share/syswm.o       \
+       share/list.o        \
+       share/fs.o          \
+       share/fs_png.o      \
+       share/fs_jpg.o      \
+       share/fs_rwops.o    \
+       share/fs_ov.o       \
+       share/dir.o         \
+       share/array.o       \
        putt/hud.o          \
        putt/game.o         \
        putt/hole.o         \
@@ -203,6 +250,11 @@ PUTT_OBJS := \
        putt/st_conf.o      \
        putt/main.o
 
+ifdef MINGW
+BALL_OBJS += neverball.ico.o
+PUTT_OBJS += neverputt.ico.o
+endif
+
 BALL_DEPS := $(BALL_OBJS:.o=.d)
 PUTT_DEPS := $(PUTT_OBJS:.o=.d)
 MAPC_DEPS := $(MAPC_OBJS:.o=.d)
@@ -210,6 +262,8 @@ MAPC_DEPS := $(MAPC_OBJS:.o=.d)
 MAPS := $(shell find data -name "*.map" \! -name "*.autosave.map")
 SOLS := $(MAPS:%.map=%.sol)
 
+DESKTOPS := $(basename $(wildcard dist/*.desktop.in))
+
 #------------------------------------------------------------------------------
 
 %.o : %.c
@@ -219,9 +273,15 @@ SOLS := $(MAPS:%.map=%.sol)
 %.sol : %.map $(MAPC_TARG)
        $(MAPC) $< data
 
+%.desktop : %.desktop.in
+       sh scripts/translate-desktop.sh < $< > $@
+
+%.ico.o: dist/ico/%.ico
+       echo "1 ICON \"$<\"" | $(WINDRES) -o $@
+
 #------------------------------------------------------------------------------
 
-all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales
+all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales desktops
 
 $(BALL_TARG) : $(BALL_OBJS)
        $(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
@@ -245,6 +305,8 @@ ifneq ($(ENABLE_NLS),0)
        $(MAKE) -C po
 endif
 
+desktops : $(DESKTOPS)
+
 clean-src :
        $(RM) $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)
        $(RM) $(PUTT_TARG) $(PUTT_OBJS) $(PUTT_DEPS)
@@ -252,14 +314,19 @@ clean-src :
 
 clean : clean-src
        $(RM) $(SOLS)
+       $(RM) $(DESKTOPS)
        $(MAKE) -C po clean
 
 test : all
        ./neverball
 
+TAGS :
+       $(RM) $@
+       find . -name '*.[ch]' | xargs etags -a
+
 #------------------------------------------------------------------------------
 
-.PHONY : all sols locales clean-src clean test
+.PHONY : all sols locales clean-src clean test TAGS
 
 -include $(BALL_DEPS) $(PUTT_DEPS) $(MAPC_DEPS)
 
@@ -293,7 +360,7 @@ TXT_DOCS := $(TEXT_DOCS:%=%.txt)
 .PHONY: setup
 setup: $(INSTALLER)
 
-$(INSTALLER): install-dlls convert-text-files all tools
+$(INSTALLER): install-dlls convert-text-files all contrib
        $(MAKENSIS) $(MAKENSIS_FLAGS) -nocd scripts/neverball.nsi
 
 $(INSTALLER): LDFLAGS := -s $(LDFLAGS)
@@ -302,7 +369,7 @@ $(INSTALLER): LDFLAGS := -s $(LDFLAGS)
 clean-setup: clean
        $(RM) install-dlls.sh *.dll $(TXT_DOCS)
        find data -name "*.txt" -exec $(FROMDOS) {} \;
-       $(MAKE) -C tools EXT=$(EXT) clean
+       $(MAKE) -C contrib EXT=$(EXT) clean
 
 #------------------------------------------------------------------------------
 
@@ -310,16 +377,8 @@ clean-setup: clean
 install-dlls: install-dlls.sh
        sh $<
 
-install-dlls.sh:
-       if ! sh scripts/gen-install-dlls.sh > $@; then \
-           $(RM) $@; \
-           exit 1; \
-       fi
-       @echo --------------------------------------------------------
-       @echo You can probably ignore any file-not-found errors above.
-       @echo Now edit $@ to your needs before restarting make.
-       @echo --------------------------------------------------------
-       @exit 1
+install-dlls.sh: $(MAPC_TARG) $(BALL_TARG) $(PUTT_TARG)
+       mingw-list-dlls --format=shell $^ > $@
 
 #------------------------------------------------------------------------------
 
@@ -333,9 +392,9 @@ convert-text-files: $(TXT_DOCS)
 
 #------------------------------------------------------------------------------
 
-.PHONY: tools
-tools:
-       $(MAKE) -C tools EXT=$(EXT)
+.PHONY: contrib
+contrib:
+       $(MAKE) -C contrib EXT=$(EXT)
 
 #------------------------------------------------------------------------------