mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-02 08:35:08 -04:00
e42b18cf71
* Fixed soh filters * add more makefile changes * almost ready * more updates * update * update * Update Makefiles to handle both platforms * Allow for overriding the CXX and CC executables * Restore original structure while supporting custom CXX flags * Remove some platform specific libs * Dynamic target name * Make X11 paths package-agnostic * Remove changes to `gfx_opengl.cpp` * Use OpenGL2 on MacOS instead of OpenGL3 * make it actually render something * render at least the first texture, still need to figure out the second one * Let’s use OpenGL 3 again * maybe this works to get the right texture? link's eyes still look off a bit * did this work? * set the platform to macos * actual numbers are right, but logic is ugly XXX/TODO, i know * add zlib to ldflags for ZAPDUtils * A bit of cleanup * Revert unneeded changes * Remove GL_CHECK * Fix issues with z64 branch * use an std::map instead of a giant array * three point filter fix (#2) * Fix mac compilation * fix audio for 64 bit * revert audio heap size, keep bigger pools * Add more Apple specific checks to our modifications * Add building instructions for macOS * Remove unecessary step from building instructions * Add missing SDL2 & GLEW to Linux LDLIBS * Update BUILDING.md Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Update soh/.gitignore to include other arch binaries Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Use right platform name for debugging window Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com> * Fix stormlib on macos (arm64) * Simplify some of the ifdef checks * Revert an older no longer necessary fix * Remove remaining unecessary deviations * Update building instructions after StormLib changes * Feature: Use OpenGL 4.1 (#1) * Further tweak the BUILDING * Tidy up * reword -j message * Add Jenkins CI Support (#2) * Fix type issues * add target <appbundle> and <filledappbundle> add makefile targets to create an .app `filledappbundle` creates the target with the .otr included this should perhaps be moved to Application Support though * pull gcc's rpath from otool output * move make target to the end so it's not default * Add Jenkins and make exe in par with other platforms * Actually save build artefacts * Fix artefact path * Remove x11 mentions and linking (not used) * Update building instructions for generating app * use appsupport directory * Add new app icon * Update target to match macOS types * Update more audio types * fix null deref in Audio_PlayFanfare * Remove old import from z64 * address final nit with apple ifdefs Co-authored-by: KiritoDev <36680385+KiritoDv@users.noreply.github.com> Co-authored-by: Jeffrey Crowell <github@crowell.biz> Co-authored-by: BountyChocolate123456 <101743444+BountyChocolate123456@users.noreply.github.com>
249 lines
6.8 KiB
Makefile
249 lines
6.8 KiB
Makefile
CXX ?= g++
|
|
CC ?= gcc
|
|
LD := lld
|
|
AR := ar
|
|
FORMAT := clang-format-11
|
|
ZAPD := ../ZAPDTR/ZAPD.out
|
|
UNAME := $(shell uname)
|
|
UNAMEM := $(shell uname -m)
|
|
|
|
LIBULTRASHIP := ../libultraship/libultraship.a
|
|
ZAPDUTILS := ../ZAPDTR/ZAPDUtils/ZAPDUtils.a
|
|
LIBSTORM := ../StormLib/build/libstorm.a
|
|
|
|
ASAN ?= 0
|
|
DEBUG ?= 1
|
|
OPTFLAGS ?= -O0
|
|
LTO ?= 0
|
|
|
|
WARN := \
|
|
-Wno-return-type \
|
|
-funsigned-char \
|
|
-fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-strict-aliasing -fno-inline-functions -fno-inline-small-functions -fno-toplevel-reorder -ffreestanding -fwrapv \
|
|
|
|
CXXFLAGS := $(WARN) -std=c++20 -D_GNU_SOURCE -fpermissive -no-pie -nostdlib
|
|
CFLAGS := $(WARN) -std=c99 -D_GNU_SOURCE -no-pie -nostdlib
|
|
LDFLAGS :=
|
|
|
|
ifeq ($(UNAME), Linux) #LINUX
|
|
CXXFLAGS += -mhard-float -msse2 -mfpmath=sse
|
|
CFLAGS += -mhard-float -msse2 -mfpmath=sse
|
|
endif
|
|
|
|
ifeq ($(UNAME), Darwin) #APPLE
|
|
CXXFLAGS += $(shell pkg-config --cflags sdl2) $(shell sdl2-config --cflags) $(shell pkg-config --cflags glew) -framework OpenGL
|
|
CFLAGS += $(shell pkg-config --cflags sdl2) $(shell sdl2-config --cflags) $(shell pkg-config --cflags glew) -framework OpenGL
|
|
endif
|
|
|
|
CPPFLAGS := -MMD
|
|
|
|
ifneq ($(DEBUG),0)
|
|
CXXFLAGS += -g
|
|
CFLAGS += -g
|
|
endif
|
|
|
|
ifneq ($(ASAN),0)
|
|
CXXFLAGS += -fsanitize=address
|
|
CFLAGS += -fsanitize=address
|
|
LDFLAGS += -fsanitize=address
|
|
endif
|
|
|
|
ifneq ($(LTO),0)
|
|
CXXFLAGS += -flto
|
|
CFLAGS += -flto
|
|
LDFLAGS += -flto
|
|
endif
|
|
|
|
ifeq ($(UNAME), Linux) #LINUX
|
|
TARGET := soh.elf
|
|
endif
|
|
|
|
ifeq ($(UNAME), Darwin) #APPLE
|
|
TARGET := soh-$(UNAMEM)
|
|
endif
|
|
|
|
INC_DIRS := $(addprefix -I, \
|
|
. \
|
|
assets \
|
|
build \
|
|
include \
|
|
src \
|
|
../ZAPDTR/ZAPDUtils \
|
|
../libultraship/libultraship \
|
|
../libultraship/libultraship/Lib/spdlog/include \
|
|
../libultraship/libultraship/Lib/Fast3D/U64 \
|
|
../libultraship/libultraship/Lib/Fast3D/U64/PR \
|
|
)
|
|
|
|
ifeq ($(UNAME), Linux) #LINUX
|
|
INC_DIRS += $(addprefix -I, \
|
|
/opt/X11/include \
|
|
)
|
|
endif
|
|
|
|
LDDIRS := $(addprefix -L, \
|
|
../libultraship/ \
|
|
)
|
|
|
|
ifeq ($(UNAME), Linux) #LINUX
|
|
LDDIRS += $(addprefix -L, \
|
|
/opt/X11/lib \
|
|
)
|
|
endif
|
|
|
|
LDLIBS := \
|
|
$(ZAPDUTILS) \
|
|
$(LIBSTORM) \
|
|
$(addprefix -l, \
|
|
dl \
|
|
bz2 \
|
|
z \
|
|
pthread \
|
|
atomic \
|
|
ultraship \
|
|
)
|
|
|
|
ifeq ($(UNAME), Linux) #LINUX
|
|
LDLIBS += \
|
|
$(addprefix -l, \
|
|
X11 \
|
|
SDL2 \
|
|
GL \
|
|
GLEW \
|
|
pulse \
|
|
)
|
|
endif
|
|
|
|
ifeq ($(UNAME), Darwin) #APPLE
|
|
LDLIBS += \
|
|
$(addprefix -framework, \
|
|
OpenGL \
|
|
) \
|
|
$(shell sdl2-config --libs) $(shell pkg-config --libs glew)
|
|
endif
|
|
|
|
ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*")
|
|
ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml))
|
|
ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin))
|
|
ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
|
|
$(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f)
|
|
|
|
TEXTURE_FILES_PNG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.png))
|
|
TEXTURE_FILES_JPG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.jpg))
|
|
TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),build/$f) \
|
|
$(foreach f,$(TEXTURE_FILES_JPG:.jpg=.jpg.inc.c),build/$f) \
|
|
|
|
CXX_FILES := \
|
|
$(shell find soh -type f -name "*.cpp")
|
|
|
|
C_FILES := \
|
|
$(shell find soh -type f -name "*.c") \
|
|
$(shell find src/boot -type f -name "*.c") \
|
|
$(shell find src/buffers -type f -name "*.c") \
|
|
$(shell find src/code -type f -name "*.c") \
|
|
$(shell find src/overlays -type f -name "*.c") \
|
|
src/libultra/gu/coss.c \
|
|
src/libultra/gu/guLookAt.c \
|
|
src/libultra/gu/guLookAtHilite.c \
|
|
src/libultra/gu/guPerspectiveF.c \
|
|
src/libultra/gu/guPosition.c \
|
|
src/libultra/gu/guS2DInitBg.c \
|
|
src/libultra/gu/ortho.c \
|
|
src/libultra/gu/rotate.c \
|
|
src/libultra/gu/sins.c \
|
|
src/libultra/gu/sintable.c \
|
|
src/libultra/libc/sprintf.c
|
|
|
|
O_FILES := \
|
|
$(C_FILES:%.c=build/%.o) \
|
|
$(CXX_FILES:%.cpp=build/%.o)
|
|
D_FILES := $(O_FILES:%.o=%.d)
|
|
|
|
# Apple App Bundle
|
|
APPNAME=soh
|
|
APPBUNDLE=$(APPNAME).app
|
|
APPBUNDLECONTENTS=$(APPBUNDLE)/Contents
|
|
APPBUNDLEEXE=$(APPBUNDLECONTENTS)/MacOS
|
|
APPBUNDLERESOURCES=$(APPBUNDLECONTENTS)/Resources
|
|
APPBUNDLEICON=$(APPBUNDLECONTENTS)/Resources
|
|
|
|
# create build directory
|
|
SRC_DIRS := $(shell find . -type d -a -not -path "*build*")
|
|
$(shell mkdir -p $(SRC_DIRS:%=build/%))
|
|
|
|
all:
|
|
$(MAKE) -C ../libultraship
|
|
$(MAKE) $(TARGET)
|
|
|
|
setup:
|
|
cd ../OTRExporter && python3 extract_baserom.py
|
|
$(MAKE) mpq
|
|
|
|
mpq:
|
|
$(MAKE) -C ../libultraship
|
|
$(MAKE) -C ../OTRExporter/OTRExporter
|
|
$(MAKE) -C ../ZAPDTR
|
|
rm -rf ../OTRExporter/oot.otr
|
|
cd ../OTRExporter && python3 extract_assets.py
|
|
cp ../OTRExporter/oot.otr .
|
|
|
|
distclean: clean
|
|
$(RM) -r baserom/
|
|
$(MAKE) clean -C ../libultraship
|
|
$(MAKE) clean -C ../OTRExporter/OTRExporter
|
|
$(MAKE) clean -C ../ZAPDTR
|
|
|
|
clean:
|
|
rm -rf build $(TARGET)
|
|
|
|
.PHONY: all clean distclean setup mpq
|
|
|
|
build/%.o: %.cpp
|
|
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) $< -o $@
|
|
|
|
build/%.o: %.c
|
|
$(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPTFLAGS) $(INC_DIRS) $< -o $@
|
|
|
|
# make soh depend on libultraship
|
|
$(TARGET): $(LIBULTRASHIP)
|
|
|
|
$(TARGET): $(O_FILES)
|
|
$(CXX) $^ -o $@ $(LDFLAGS) -fuse-ld=$(LD) $(LDDIRS) $(LDLIBS)
|
|
|
|
-include $(D_FILES)
|
|
|
|
appbundle: macosx/$(APPNAME).icns
|
|
rm -rf $(APPBUNDLE)
|
|
mkdir $(APPBUNDLE)
|
|
mkdir $(APPBUNDLE)/Contents
|
|
mkdir $(APPBUNDLE)/Contents/MacOS
|
|
mkdir $(APPBUNDLE)/Contents/Resources
|
|
cp macosx/Info.plist $(APPBUNDLECONTENTS)/
|
|
cp macosx/PkgInfo $(APPBUNDLECONTENTS)/
|
|
cp macosx/$(APPNAME).icns $(APPBUNDLEICON)/
|
|
cp $(TARGET) $(APPBUNDLEEXE)/soh
|
|
cp macosx/launcher.sh $(APPBUNDLEEXE)/launcher.sh
|
|
clang -ObjC macosx/appsupport.m -arch arm64 -arch x86_64 -framework Foundation -o macosx/appsupport
|
|
cp macosx/appsupport $(APPBUNDLEEXE)/appsupport
|
|
otool -l $(TARGET) | grep -A 2 LC_RPATH | tail -n 1 | awk '{print $2}' | dylibbundler -od -b -x $(APPBUNDLEEXE)/soh -d $(APPBUNDLECONTENTS)/libs
|
|
|
|
macosx/$(APPNAME).icns: macosx/$(APPNAME)Icon.png
|
|
rm -rf macosx/$(APPNAME).iconset
|
|
mkdir macosx/$(APPNAME).iconset
|
|
sips -z 16 16 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_16x16.png
|
|
sips -z 32 32 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_16x16@2x.png
|
|
sips -z 32 32 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_32x32.png
|
|
sips -z 64 64 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_32x32@2x.png
|
|
sips -z 128 128 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_128x128.png
|
|
sips -z 256 256 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_128x128@2x.png
|
|
sips -z 256 256 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_256x256.png
|
|
sips -z 512 512 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_256x256@2x.png
|
|
sips -z 512 512 macosx/$(APPNAME)Icon.png --out macosx/$(APPNAME).iconset/icon_512x512.png
|
|
cp macosx/$(APPNAME)Icon.png macosx/$(APPNAME).iconset/icon_512x512@2x.png
|
|
iconutil -c icns -o macosx/$(APPNAME).icns macosx/$(APPNAME).iconset
|
|
rm -r macosx/$(APPNAME).iconset
|
|
|
|
filledappbundle: appbundle
|
|
cp ./oot.otr $(APPBUNDLEEXE)/oot.otr
|
|
|