Merge branch 'macos' of github.com:igilham/starfighter into macos

.gitignore

@@ -13,10 +13,12 @@ src/starfighter
 aclocal.m4
 autom4te.cache
 compile
+config.guess
 config.h
 config.h.in
 config.log
 config.status
+config.sub
 configure
 depcomp
 install-sh
@@ -28,6 +30,7 @@ config.h.in~
 src/Makefile
 src/Makefile.in
 src/.deps
+src/conf
 misc/Makefile
 misc/Makefile.in
 misc/.deps

README.txt

@@ -104,6 +104,11 @@ following from the Project: Starfighter base directory:
     make
     mv src/starfighter .
 
+Note that you may see errors relating to 'TTF_OpenFont' failures if you did not move the binary out of the src directory. E.g:
+
+    Current directory "/Users/yourname/code/starfighter/src"
+    ERROR: TTF_OpenFont: Couldn't open data/TakaoPGothic.ttf
+
 Run "./configure --help" to see all options for compiling.
 
 ------------------------------------------------------------------------
@@ -136,6 +141,14 @@ terminal window:
 
 The arguments to autoreconf are technically optional, but recommended.
 
+The Python script build.py may fail on MacOS due to a missing msgfmt
+program. msgfmt is part of gettext and the version that ships on a Mac
+does not include the msgfmt utility. This can be solved by using gettext
+from Homebrew:
+
+    brew install gettext
+    export PATH="$(brew --prefix gettext)/bin:$PATH"
+
 If for some reason you need to remove all of these files from your
 directory, you can do so via the following command (requires Git):
 
@@ -143,4 +156,3 @@ directory, you can do so via the following command (requires Git):
 
 Note: automatically generated files are listed in .gitignore, so you
 generally don't actually have to do this.
-

configure.ac

@@ -20,6 +20,18 @@ AC_PROG_INSTALL
 STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\" -Wall -Wformat-truncation=0"
 
 # Checks for libraries.
+
+# Detect MacOS
+AC_CANONICAL_HOST
+build_mac=no
+
+case $host_os in
+  darwin*) build_mac=yes
+  	;;
+esac
+
+AM_CONDITIONAL([BUILD_MACOS], [test "$build_mac" = "yes"])
+
 AC_SEARCH_LIBS([atanf], [m])
 
 PKG_CHECK_EXISTS([SDL2_mixer], [

src/Makefile.am

@@ -11,6 +11,10 @@ else
 starfighter_CPPFLAGS = $(STARFIGHTER_CPPFLAGS) -DDATADIR=\"$(pkgdatadir)\"
 endif
 
+if BUILD_MACOS
+starfighter_LDFLAGS = -framework CoreFoundation
+endif
+
 starfighter_CFLAGS = $(SDL_CFLAGS) $(PANGO_CFLAGS)
 starfighter_LDADD = $(SDL_LIBS) $(PANGO_LIBS)