X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=de2a853ac3c500c364f65acd871e6f2dbf6f8a02;hb=e8485694b9c8088212078223bf656504e763d733;hp=e0af189441f2823b488eb9ad967aec0665f85162;hpb=0d6cc429b5978e8afb73a70c0b51c779197939db;p=neverball

diff --git a/Makefile b/Makefile
index e0af189..de2a853 100644
--- a/Makefile
+++ b/Makefile
@@ -1,191 +1,344 @@
 
 #------------------------------------------------------------------------------
 
-# Maybe you need one of these.  Maybe you don't.
+VERSION := $(shell sh scripts/version.sh)
+ifeq ($(VERSION),unknown)
+    $(warning Failed to obtain sane version for this build.)
+endif
 
-#X11_PATH= -L/usr/X11/lib
-#X11_PATH= -L/usr/X11R6/lib
+# Provide a target system hint for the Makefile.
 
-OGL_LIBS= -lGL -lm
-#OGL_LIBS= -lm                                                # Think Different
+ifeq ($(shell uname), Darwin)
+    DARWIN := 1
+endif
 
 #------------------------------------------------------------------------------
-# Configuration constants
+# Optional flags (CFLAGS, CPPFLAGS, ...)
+
+ifeq ($(ENABLE_WII),1)
+    # libwiimote is NOT ANSI compliant
+    CFLAGS := -O2
+else
+    #CFLAGS := -Wall -g -ansi -pedantic
+    CFLAGS := -Wall -O2 -ansi -pedantic
+endif
+
 #------------------------------------------------------------------------------
+# Mandatory flags
+
+# Compiler...
+
+ALL_CFLAGS := $(CFLAGS)
+
+# Preprocessor...
+
+SDL_CPPFLAGS := $(shell sdl-config --cflags)
+PNG_CPPFLAGS := $(shell libpng-config --cflags)
+
+ALL_CPPFLAGS := $(SDL_CPPFLAGS) $(PNG_CPPFLAGS) -Ishare \
+    -DVERSION=\"$(VERSION)\"
+
+ifeq ($(ENABLE_NLS),0)
+    ALL_CPPFLAGS += -DENABLE_NLS=0
+else
+    ALL_CPPFLAGS += -DENABLE_NLS=1
+endif
+
+ifeq ($(ENABLE_WII),1)
+    ALL_CPPFLAGS += -DENABLE_WII=1
+endif
+
+ifdef DARWIN
+    ALL_CPPFLAGS += -I/opt/local/include
+endif
+
+ALL_CPPFLAGS += $(CPPFLAGS)
+
+#------------------------------------------------------------------------------
+# Libraries
+
+SDL_LIBS := $(shell sdl-config --libs)
+PNG_LIBS := $(shell libpng-config --libs)
+
+# The  non-conditionalised values  below  are specific  to the  native
+# system. The native system of this Makefile is Linux (or GNU+Linux if
+# you prefer). Please be sure to  override ALL of them for each target
+# system in the conditional parts below.
+
+INTL_LIBS :=
+
+ifeq ($(ENABLE_WII),1)
+    TILT_LIBS := -lcwiimote -lbluetooth
+endif
 
-CFLAGS= -Wall -g -O3 -ansi -pedantic $(shell sdl-config --cflags)
-#CFLAGS= -Wall -g -O1 -ansi -pedantic $(shell sdl-config --cflags)
-#CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
+OGL_LIBS := -lGL -lm
 
-SDL_LIBS= $(shell sdl-config --libs)
+ifdef MINGW
+    ifneq ($(ENABLE_NLS),0)
+        INTL_LIBS := -lintl -liconv
+    endif
 
-MAPC_TARG= mapc
-MAPC_EXEC = ./$(MAPC_TARG)
-BALL_TARG= neverball
-PUTT_TARG= neverputt
+    TILT_LIBS :=
+    OGL_LIBS  := -lopengl32 -lm
+endif
 
-LOCALEDIR= locale
-LOCALEDOM= neverball
+ifdef DARWIN
+    ifneq ($(ENABLE_NLS),0)
+        INTL_LIBS := -lintl -liconv
+    endif
 
-POTFILE= po/neverball.pot
+    TILT_LIBS :=
+    OGL_LIBS  := -framework OpenGL
+endif
 
-#-------------------------------------------------------------------------------
+BASE_LIBS := -ljpeg $(PNG_LIBS)
 
-MAPC_OBJS= \
-	share/vec3.o   \
+ifdef DARWIN
+    BASE_LIBS += -L/opt/local/lib
+endif
+
+ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+    -lvorbisfile $(OGL_LIBS)
+
+#------------------------------------------------------------------------------
+
+ifdef MINGW
+    EXT := .exe
+endif
+
+MAPC_TARG := mapc$(EXT)
+BALL_TARG := neverball$(EXT)
+PUTT_TARG := neverputt$(EXT)
+
+ifdef MINGW
+    MAPC := $(WINE) ./$(MAPC_TARG)
+else
+    MAPC := ./$(MAPC_TARG)
+endif
+
+
+#------------------------------------------------------------------------------
+
+MAPC_OBJS := \
+	share/vec3.o        \
 	share/base_image.o  \
-	share/solid.o  \
-	share/binary.o \
+	share/solid.o       \
+	share/binary.o      \
 	share/base_config.o \
 	share/mapc.o
-BALL_OBJS= \
-	share/i18n.o    \
-	share/st_lang.o \
-	share/st_resol.o \
-	share/vec3.o    \
-	share/base_image.o   \
-	share/image.o   \
-	share/solid.o   \
-	share/solid_gl.o\
-	share/part.o    \
-	share/back.o    \
-	share/geom.o    \
-	share/gui.o     \
-	share/base_config.o  \
-	share/config.o  \
-	share/binary.o  \
-	share/state.o   \
-	share/audio.o   \
-	ball/hud.o      \
-	ball/game.o     \
-	ball/level.o    \
-	ball/levels.o   \
-	ball/set.o      \
-	ball/demo.o     \
-	ball/util.o     \
-	ball/st_conf.o  \
-	ball/st_demo.o  \
-	ball/st_save.o  \
-	ball/st_play_end.o  \
-	ball/st_done.o  \
-	ball/st_level.o \
-	ball/st_over.o  \
-	ball/st_play.o  \
-	ball/st_set.o   \
-	ball/st_start.o \
-	ball/st_title.o \
-	ball/st_help.o  \
-	ball/st_name.o  \
-	ball/st_shared.o  \
+BALL_OBJS := \
+	share/lang.o        \
+	share/st_resol.o    \
+	share/vec3.o        \
+	share/base_image.o  \
+	share/image.o       \
+	share/solid.o       \
+	share/solid_gl.o    \
+	share/part.o        \
+	share/back.o        \
+	share/geom.o        \
+	share/ball.o        \
+	share/gui.o         \
+	share/base_config.o \
+	share/config.o      \
+	share/binary.o      \
+	share/state.o       \
+	share/audio.o       \
+	share/text.o        \
+	share/sync.o        \
+	share/tilt.o        \
+	share/common.o      \
+	ball/hud.o          \
+	ball/mode.o         \
+	ball/game.o         \
+	ball/score.o        \
+	ball/level.o        \
+	ball/levels.o       \
+	ball/set.o          \
+	ball/demo.o         \
+	ball/util.o         \
+	ball/st_conf.o      \
+	ball/st_demo.o      \
+	ball/st_save.o      \
+	ball/st_goal.o      \
+	ball/st_fall_out.o  \
+	ball/st_time_out.o  \
+	ball/st_done.o      \
+	ball/st_level.o     \
+	ball/st_over.o      \
+	ball/st_play.o      \
+	ball/st_set.o       \
+	ball/st_start.o     \
+	ball/st_title.o     \
+	ball/st_help.o      \
+	ball/st_name.o      \
+	ball/st_shared.o    \
+	ball/st_pause.o     \
 	ball/main.o
-PUTT_OBJS= \
-	share/i18n.o    \
-	share/st_lang.o \
-	share/st_resol.o \
-	share/vec3.o   \
+PUTT_OBJS := \
+	share/lang.o        \
+	share/st_resol.o    \
+	share/vec3.o        \
 	share/base_image.o  \
-	share/image.o  \
-	share/solid.o  \
-	share/solid_gl.o  \
-	share/part.o   \
-	share/geom.o   \
-	share/back.o   \
-	share/base_config.o  \
-	share/config.o \
-	share/binary.o \
-	share/audio.o  \
-	share/state.o  \
-	share/gui.o    \
-	putt/hud.o     \
-	putt/game.o    \
-	putt/hole.o    \
-	putt/course.o  \
-	putt/st_all.o  \
-	putt/st_conf.o \
+	share/image.o       \
+	share/solid.o       \
+	share/solid_gl.o    \
+	share/part.o        \
+	share/geom.o        \
+	share/ball.o        \
+	share/back.o        \
+	share/base_config.o \
+	share/config.o      \
+	share/binary.o      \
+	share/audio.o       \
+	share/state.o       \
+	share/gui.o         \
+	share/text.o        \
+	share/sync.o        \
+	putt/hud.o          \
+	putt/game.o         \
+	putt/hole.o         \
+	putt/course.o       \
+	putt/st_all.o       \
+	putt/st_conf.o      \
 	putt/main.o
 
-BALL_DEPS= $(BALL_OBJS:.o=.d)
-PUTT_DEPS= $(PUTT_OBJS:.o=.d)
-MAPC_DEPS= $(MAPC_OBJS:.o=.d)
+BALL_DEPS := $(BALL_OBJS:.o=.d)
+PUTT_DEPS := $(PUTT_OBJS:.o=.d)
+MAPC_DEPS := $(MAPC_OBJS:.o=.d)
 
-BASE_LIBS= $(SDL_LIBS) -lSDL_image
-LIBS= $(X11_PATH) $(BASE_LIBS) -lSDL_ttf -lSDL_mixer $(OGL_LIBS)
+MAPS := $(shell find data -name "*.map" \! -name "*.autosave.map")
+SOLS := $(MAPS:%.map=%.sol)
 
-MESSAGEPART= /LC_MESSAGES/$(LOCALEDOM).mo
-MESSAGES= $(LINGUAS:%=$(LOCALEDIR)/%$(MESSAGEPART))
-
-MAPS= $(shell find data/ -name '*.map')
-SOLS= $(MAPS:%.map=%.sol)
-
-POS= $(shell echo po/*.po)
-LINGUAS= $(POS:po/%.po=%)
-
-#------------------------------------------------------------------------------
-# Implicit rules
 #------------------------------------------------------------------------------
 
-%.d : %.c
-	$(CC) $(CFLAGS) -Ishare -MM -MF $@ -MT '$*.o $@' $<
-
 %.o : %.c
-	$(CC) $(CFLAGS) -Ishare -o $@ -c $<
+	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -MM -MP -MF $*.d -MT "$@" $<
+	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
 
 %.sol : %.map $(MAPC_TARG)
-	$(MAPC_EXEC) $< data
-
-$(LOCALEDIR)/%$(MESSAGEPART) : po/%.po
-	mkdir -p `dirname $@`
-	msgfmt -c -v -o $@ $<
+	$(MAPC) $< data
 
 #------------------------------------------------------------------------------
-# Main rules
-#------------------------------------------------------------------------------
 
 all : $(BALL_TARG) $(PUTT_TARG) $(MAPC_TARG) sols locales
 
 $(BALL_TARG) : $(BALL_OBJS)
-	$(CC) $(CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LIBS)
+	$(CC) $(ALL_CFLAGS) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
 
 $(PUTT_TARG) : $(PUTT_OBJS)
-	$(CC) $(CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LIBS)
+	$(CC) $(ALL_CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
 
 $(MAPC_TARG) : $(MAPC_OBJS)
-	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(BASE_LIBS)
+	$(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(BASE_LIBS)
+
+# Work around some extremely helpful sdl-config scripts.
+
+ifdef MINGW
+$(MAPC_TARG) : ALL_CPPFLAGS := $(ALL_CPPFLAGS) -Umain
+endif
 
 sols : $(SOLS)
 
-locales : $(MESSAGES)
+locales :
+ifneq ($(ENABLE_NLS),0)
+	$(MAKE) -C po
+endif
 
 clean-src :
-	rm -f $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)
-	rm -f $(PUTT_TARG) $(PUTT_OBJS) $(PUTT_DEPS)
-	rm -f $(MAPC_TARG) $(MAPC_OBJS) $(MAPC_DEPS)
+	$(RM) $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)
+	$(RM) $(PUTT_TARG) $(PUTT_OBJS) $(PUTT_DEPS)
+	$(RM) $(MAPC_TARG) $(MAPC_OBJS) $(MAPC_DEPS)
 
 clean : clean-src
-	rm -f $(SOLS)
-	rm -rf $(LOCALEDIR)
+	$(RM) $(SOLS)
+	$(MAKE) -C po clean
 
 test : all
 	./neverball
 
 #------------------------------------------------------------------------------
-# PO update rules
+
+.PHONY : all sols locales clean-src clean test
+
+-include $(BALL_DEPS) $(PUTT_DEPS) $(MAPC_DEPS)
+
 #------------------------------------------------------------------------------
 
-po/%.po : $(POTFILE)
-	msgmerge -U $@ $<
-	touch $@
-	
-po-update-extract :
-	bash extractpo.sh $(POTFILE) $(LOCALEDOM)
+ifdef MINGW
 
-po-update-merge : $(POS)
+#------------------------------------------------------------------------------
+
+INSTALLER := ../neverball-$(VERSION)-setup.exe
+
+MAKENSIS := makensis
+MAKENSIS_FLAGS := -DVERSION=$(VERSION) -DOUTFILE=$(INSTALLER)
+
+TODOS   := todos
+FROMDOS := fromdos
 
-po-update : po-update-extract po-update-merge
+CP := cp
+
+TEXT_DOCS := \
+	doc/AUTHORS \
+	doc/MANUAL  \
+	CHANGES     \
+	COPYING     \
+	README
+
+TXT_DOCS := $(TEXT_DOCS:%=%.txt)
 
 #------------------------------------------------------------------------------
 
-.PHONY : all sols locales clean-src clean test \
-	po-update-extract po-update-merge po-update
+.PHONY: setup
+setup: $(INSTALLER)
 
--include $(BALL_DEPS) $(PUTT_DEPS) $(MAPC_DEPS)
+$(INSTALLER): install-dlls convert-text-files all tools
+	$(MAKENSIS) $(MAKENSIS_FLAGS) -nocd scripts/neverball.nsi
+
+$(INSTALLER): LDFLAGS := -s $(LDFLAGS)
+
+.PHONY: clean-setup
+clean-setup: clean
+	$(RM) install-dlls.sh *.dll $(TXT_DOCS)
+	find data -name "*.txt" -exec $(FROMDOS) {} \;
+	$(MAKE) -C tools EXT=$(EXT) clean
+
+#------------------------------------------------------------------------------
+
+.PHONY: install-dlls
+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
+
+#------------------------------------------------------------------------------
+
+.PHONY: convert-text-files
+convert-text-files: $(TXT_DOCS)
+	find data -name "*.txt" -exec $(TODOS) {} \;
+
+%.txt: %
+	$(CP) $< $@
+	$(TODOS) $@
+
+#------------------------------------------------------------------------------
+
+.PHONY: tools
+tools:
+	$(MAKE) -C tools EXT=$(EXT)
+
+#------------------------------------------------------------------------------
+
+endif
+
+#------------------------------------------------------------------------------