Revert "Converted to C... tried and failed to convert Autoconf."

This reverts commit 7fd19f29ba.
This commit is contained in:
Julie Marchant 2019-05-20 01:56:16 -04:00
parent 7fd19f29ba
commit e51c55b16b
28 changed files with 31 additions and 2611 deletions

View File

@ -9,11 +9,12 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([Project: Starfighter], [1.8-dev], [onpon4@riseup.net], [starfighter]) AC_INIT([Project: Starfighter], [1.8-dev], [onpon4@riseup.net], [starfighter])
AM_INIT_AUTOMAKE([foreign -Wall -Werror]) AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AC_CONFIG_SRCDIR([src/Starfighter.c]) AC_CONFIG_SRCDIR([src/Starfighter.cpp])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
# Checks for programs. # Checks for programs.
AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL

View File

@ -5,60 +5,61 @@
bin_PROGRAMS = starfighter bin_PROGRAMS = starfighter
starfighter_CFLAGS = $(STARFIGHTER_CFLAGS) $(SDL_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" -Wall starfighter_CPPFLAGS = $(STARFIGHTER_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" -Wall
starfighter_CXXFLAGS = $(SDL_CFLAGS)
starfighter_LDADD = $(SDL_LIBS) starfighter_LDADD = $(SDL_LIBS)
starfighter_SOURCES = \ starfighter_SOURCES = \
Starfighter.c \ Starfighter.cpp \
alien.c \ alien.cpp \
alien.h \ alien.h \
audio.c \ audio.cpp \
audio.h \ audio.h \
bullet.c \ bullet.cpp \
bullet.h \ bullet.h \
cargo.c \ cargo.cpp \
cargo.h \ cargo.h \
collectable.c \ collectable.cpp \
collectable.h \ collectable.h \
colors.c \ colors.cpp \
colors.h \ colors.h \
cutscene.c \ cutscene.cpp \
cutscene.h \ cutscene.h \
defs.h \ defs.h \
engine.c \ engine.cpp \
engine.h \ engine.h \
event.c \ event.cpp \
event.h \ event.h \
explosion.c \ explosion.cpp \
explosion.h \ explosion.h \
game.c \ game.cpp \
game.h \ game.h \
gfx.c \ gfx.cpp \
gfx.h \ gfx.h \
info.c \ info.cpp \
info.h \ info.h \
intermission.c \ intermission.cpp \
intermission.h \ intermission.h \
mission.c \ mission.cpp \
mission.h \ mission.h \
player.c \ player.cpp \
player.h \ player.h \
radio.c \ radio.cpp \
radio.h \ radio.h \
renderer.c \ renderer.cpp \
renderer.h \ renderer.h \
save.c \ save.cpp \
save.h \ save.h \
screen.c \ screen.cpp \
screen.h \ screen.h \
ship.c \ ship.cpp \
ship.h \ ship.h \
shop.c \ shop.cpp \
shop.h \ shop.h \
structs.h \ structs.h \
title.c \ title.cpp \
title.h \ title.h \
weapons.c \ weapons.cpp \
weapons.h \ weapons.h \
window.c \ window.cpp \
window.h window.h

View File

@ -2,7 +2,7 @@
Project: Starfighter Project: Starfighter
Copyright (C) 2003 Parallel Realities Copyright (C) 2003 Parallel Realities
Copyright (C) 2011, 2012 Guus Sliepen Copyright (C) 2011, 2012 Guus Sliepen
Copyright (C) 2015-2019 Julie Marchant <onpon4@riseup.net> Copyright (C) 2015-2017 Julie Marchant <onpon4@riseup.net>
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

2582
src/game.c

File diff suppressed because it is too large Load Diff