Lunatic: Remove guard against building in C++ mode. We now support both!

git-svn-id: https://svn.eduke32.com/eduke32@6000 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-01-05 05:30:04 +00:00
parent 93edc7a241
commit 534c98a7b0
2 changed files with 4 additions and 8 deletions

View file

@ -246,10 +246,6 @@ ifneq ($(LUNATIC),0)
# FIXME: Lunatic builds with LTO don't start up properly as the required
# symbol names are apparently not exported.
override LTO=0
ifneq ($(CPLUSPLUS),0)
$(error "Lunatic C++ build not supported")
endif
endif
ifndef LTO

View file

@ -171,8 +171,8 @@ then
if [ -n "$BUILD_LUNATIC" ]; then
# clean the tree and build
echo "${make[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
"${make[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
echo "${make[@]}" LUNATIC=1 $clean all
"${make[@]}" LUNATIC=1 $clean all
# make sure all the targets were produced
verifytargets
@ -190,8 +190,8 @@ then
if [ -n "$BUILD_LUNATIC" ]; then
# clean the tree and build
echo "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
"${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
echo "${make64[@]}" LUNATIC=1 $clean all
"${make64[@]}" LUNATIC=1 $clean all
# make sure all the targets were produced
verifytargets