walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Layla Marchant 2020-03-12 15:30:32 -04:00
parent 34c42e8aa2 ced5066454
commit 0ec878c213
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

14
README.txt
View File

@ -104,6 +104,11 @@ following from the Project: Starfighter base directory:
make make
mv src/starfighter . 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. 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 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 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): 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 Note: automatically generated files are listed in .gitignore, so you
generally don't actually have to do this. generally don't actually have to do this.

12
configure.ac
View File

@ -20,6 +20,18 @@ AC_PROG_INSTALL
STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\" -Wall -Wformat-truncation=0" STARFIGHTER_CPPFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\" -Wall -Wformat-truncation=0"
# Checks for libraries. # 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]) AC_SEARCH_LIBS([atanf], [m])
PKG_CHECK_EXISTS([SDL2_mixer], [ PKG_CHECK_EXISTS([SDL2_mixer], [

4
src/Makefile.am
View File

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