Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES

This commit is contained in:
Random06457 2022-05-02 19:25:15 +09:00
commit e5d090174b
3 changed files with 16 additions and 9 deletions

1
soh/.gitignore vendored
View file

@ -401,6 +401,7 @@ ZAPDUtils/ZAPDUtils.a
build/ build/
ZAPDUtils/build/ ZAPDUtils/build/
ZAPD/BuildInfo.h ZAPD/BuildInfo.h
cvars.cfg
DebugObj/* DebugObj/*
ReleaseObj/* ReleaseObj/*

View file

@ -94,14 +94,16 @@ TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),build/$f) \
CXX_FILES := \ CXX_FILES := \
soh/Enhancements/debugconsole.cpp \ soh/Enhancements/debugconsole.cpp \
soh/GbiWrap.cpp \ soh/Enhancements/debugger/colViewer.cpp \
soh/OTRGlobals.cpp \
soh/z_message_OTR.cpp \
soh/z_play_otr.cpp \
soh/z_scene_otr.cpp \
soh/Enhancements/debugger/debugger.cpp \ soh/Enhancements/debugger/debugger.cpp \
soh/Enhancements/debugger/debugSaveEditor.cpp \ soh/Enhancements/debugger/debugSaveEditor.cpp \
soh/util.cpp soh/Enhancements/debugger/ImGuiHelpers.cpp \
soh/GbiWrap.cpp \
soh/OTRGlobals.cpp \
soh/util.cpp \
soh/z_message_OTR.cpp \
soh/z_play_otr.cpp \
soh/z_scene_otr.cpp
C_FILES := \ C_FILES := \
soh/Enhancements/bootcommands.c \ soh/Enhancements/bootcommands.c \
@ -823,6 +825,9 @@ mpq:
distclean: clean distclean: clean
$(RM) -r baserom/ $(RM) -r baserom/
$(MAKE) clean -C ../libultraship
$(MAKE) clean -C ../OTRExporter/OTRExporter
$(MAKE) clean -C ../ZAPDTR
clean: clean:
rm -rf build $(TARGET) rm -rf build $(TARGET)

View file

@ -4,6 +4,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <cmath>
extern "C" { extern "C" {
#include <z64.h> #include <z64.h>