Merge branch 'master' of github.com:pr-starfighter/starfighter
This commit is contained in:
commit
835947e47b
|
@ -6,11 +6,6 @@
|
|||
SUBDIRS = src misc
|
||||
|
||||
dist_doc_DATA = README.txt COPYING LICENSES
|
||||
EXTRA_DIST = starfighter.sh win32build.sh data gfx music sound locale misc
|
||||
|
||||
if !RUN_IN_PLACE
|
||||
|
||||
nobase_pkgdata_DATA = data/* gfx/* music/* sound/* locale/*
|
||||
|
||||
endif
|
||||
nobase_dist_pkgdata_DATA = data/* gfx/* music/* sound/* locale/*
|
||||
EXTRA_DIST = starfighter.sh win32build.sh misc
|
||||
|
||||
|
|
|
@ -20,6 +20,8 @@ AC_PROG_INSTALL
|
|||
STARFIGHTER_CFLAGS="-DVERSION=\\\"$PACKAGE_VERSION\\\""
|
||||
|
||||
# Checks for libraries.
|
||||
AC_SEARCH_LIBS([atanf], [m])
|
||||
|
||||
PKG_CHECK_EXISTS([SDL2_mixer], [
|
||||
PKG_CHECK_EXISTS([SDL2_ttf], [
|
||||
PKG_CHECK_MODULES([SDL], [sdl2 SDL2_image SDL2_mixer SDL2_ttf])
|
||||
|
@ -65,7 +67,7 @@ AS_IF([test -n "$SF_RUN_IN_PLACE"], [
|
|||
echo "Preparing a run-in-place build"
|
||||
])
|
||||
|
||||
AM_CONDITIONAL([RUN_IN_PLACE], [test "$SF_RUN_IN_PLACE = 1"])
|
||||
AM_CONDITIONAL([RUN_IN_PLACE], [test -n "$SF_RUN_IN_PLACE"])
|
||||
|
||||
AC_SUBST([STARFIGHTER_CFLAGS])
|
||||
|
||||
|
|
|
@ -3,12 +3,9 @@
|
|||
# http://creativecommons.org/publicdomain/zero/1.0/ for more
|
||||
# information. This file is offered as-is, without any warranty.
|
||||
|
||||
if !RUN_IN_PLACE
|
||||
|
||||
desktopdir = $(datarootdir)/applications
|
||||
desktop_DATA = starfighter.desktop
|
||||
|
||||
icondir = $(datarootdir)/pixmaps
|
||||
icon_DATA = starfighter.png
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
# This file has been dedicated to the public domain, to the extent
|
||||
# possible under applicable law, via CC0. See
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/ for more
|
||||
# information. This file is offered as-is, without any warranty.
|
||||
|
||||
if !RUN_IN_PLACE
|
||||
|
||||
nobase_pkgdata_DATA = *
|
||||
|
||||
endif
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# This file has been dedicated to the public domain, to the extent
|
||||
# possible under applicable law, via CC0. See
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/ for more
|
||||
# information. This file is offered as-is, without any warranty.
|
||||
|
||||
if !RUN_IN_PLACE
|
||||
|
||||
nobase_pkgdata_DATA = *
|
||||
|
||||
endif
|
||||
|
|
@ -11,7 +11,7 @@ else
|
|||
starfighter_CPPFLAGS = $(STARFIGHTER_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" -Wall
|
||||
endif
|
||||
|
||||
starfighter_CFLAGS = $(SDL_CFLAGS) $(PANGO_CFLAGS) -lm
|
||||
starfighter_CFLAGS = $(SDL_CFLAGS) $(PANGO_CFLAGS)
|
||||
starfighter_LDADD = $(SDL_LIBS) $(PANGO_LIBS)
|
||||
|
||||
starfighter_SOURCES = \
|
||||
|
|
Loading…
Reference in New Issue