mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-29 21:02:18 -05: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>
141 lines
3.3 KiB
Makefile
141 lines
3.3 KiB
Makefile
# use variables in submakes
|
|
export
|
|
OPTIMIZATION_ON ?= 1
|
|
ASAN ?= 0
|
|
DEPRECATION_ON ?= 1
|
|
DEBUG ?= 0
|
|
COPYCHECK_ARGS ?=
|
|
LLD ?= 0
|
|
WERROR ?= 0
|
|
UNAME := $(shell uname)
|
|
|
|
# Use clang++ if available, else use g++
|
|
ifeq ($(shell command -v clang++ >/dev/null 2>&1; echo $$?),0)
|
|
CXX ?= clang++
|
|
else
|
|
CXX ?= g++
|
|
endif
|
|
|
|
INC := -I ZAPD -I lib/elfio -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils
|
|
CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer
|
|
OPTFLAGS :=
|
|
|
|
ifneq ($(DEBUG),0)
|
|
OPTIMIZATION_ON = 0
|
|
CXXFLAGS += -g3 -DDEVELOPMENT -D_DEBUG
|
|
COPYCHECK_ARGS += --devel
|
|
DEPRECATION_ON = 0
|
|
endif
|
|
|
|
ifneq ($(WERROR),0)
|
|
CXXFLAGS += -Werror
|
|
endif
|
|
|
|
ifeq ($(OPTIMIZATION_ON),0)
|
|
OPTFLAGS := -O0
|
|
else
|
|
OPTFLAGS := -O2
|
|
endif
|
|
|
|
ifneq ($(ASAN),0)
|
|
CXXFLAGS += -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined
|
|
endif
|
|
ifneq ($(DEPRECATION_ON),0)
|
|
CXXFLAGS += -DDEPRECATION_ON
|
|
endif
|
|
# CXXFLAGS += -DTEXTURE_DEBUG
|
|
|
|
LDFLAGS := -lm -ldl \
|
|
-L../StormLib/build -L../libultraship -lbz2 -pthread -lultraship -lstorm
|
|
|
|
ifeq ($(UNAME), Darwin)
|
|
LDFLAGS += $(shell pkg-config --libs glew libpng zlib) $(shell sdl2-config --libs) -framework OpenGL
|
|
INC += $(shell pkg-config --cflags libpng)
|
|
else
|
|
LDFLAGS += -lpng -lGL -lGLEW -lX11 -lz -lSDL2 -lpulse
|
|
endif
|
|
|
|
# Use LLD if available. Set LLD=0 to not use it
|
|
ifeq ($(shell command -v ld.lld >/dev/null 2>&1; echo $$?),0)
|
|
LLD := 1
|
|
endif
|
|
|
|
ifneq ($(LLD),0)
|
|
LDFLAGS += -fuse-ld=lld
|
|
endif
|
|
|
|
UNAMEM := $(shell uname -m)
|
|
ifneq ($(UNAME), Darwin)
|
|
LDFLAGS += -Wl,-export-dynamic -lstdc++fs
|
|
EXPORTERS := -Wl,--whole-archive ../OTRExporter/OTRExporter/OTRExporter.a -Wl,--no-whole-archive
|
|
else
|
|
EXPORTERS := -Wl,-force_load ../OTRExporter/OTRExporter/OTRExporter.a
|
|
endif
|
|
|
|
|
|
ZAPD_SRC_DIRS := $(shell find ZAPD -type d)
|
|
SRC_DIRS = $(ZAPD_SRC_DIRS) lib/tinyxml2
|
|
|
|
ZAPD_CPP_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.cpp))
|
|
ZAPD_H_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.h))
|
|
|
|
CPP_FILES += $(ZAPD_CPP_FILES) lib/tinyxml2/tinyxml2.cpp
|
|
O_FILES := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f)
|
|
O_FILES += build/ZAPD/BuildInfo.o
|
|
|
|
# create build directories
|
|
$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir)))
|
|
|
|
|
|
# Main targets
|
|
all: ZAPD.out copycheck
|
|
|
|
build/ZAPD/BuildInfo.o:
|
|
python3 ZAPD/genbuildinfo.py $(COPYCHECK_ARGS)
|
|
$(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) build/ZAPD/BuildInfo.cpp
|
|
|
|
copycheck: ZAPD.out
|
|
python3 copycheck.py
|
|
|
|
clean:
|
|
rm -rf build ZAPD.out
|
|
$(MAKE) -C lib/libgfxd clean
|
|
$(MAKE) -C ZAPDUtils clean
|
|
$(MAKE) -C ExporterTest clean
|
|
rm -rf ../StormLib/build
|
|
|
|
rebuild: clean all
|
|
|
|
format:
|
|
clang-format-11 -i $(ZAPD_CPP_FILES) $(ZAPD_H_FILES)
|
|
$(MAKE) -C ZAPDUtils format
|
|
$(MAKE) -C ExporterTest format
|
|
|
|
.PHONY: all build/ZAPD/BuildInfo.o copycheck clean rebuild format
|
|
|
|
build/%.o: %.cpp
|
|
$(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) $<
|
|
|
|
|
|
# Submakes
|
|
lib/libgfxd/libgfxd.a:
|
|
$(MAKE) -C lib/libgfxd
|
|
|
|
.PHONY: StormLib
|
|
StormLib:
|
|
LDFLAGS="" cmake -B ../StormLib/build -S ../StormLib
|
|
LDFLAGS="" cmake --build ../StormLib/build
|
|
|
|
.PHONY: ExporterTest
|
|
ExporterTest:
|
|
$(MAKE) -C ExporterTest
|
|
|
|
.PHONY: ZAPDUtils
|
|
ZAPDUtils:
|
|
$(MAKE) -C ZAPDUtils
|
|
|
|
|
|
# Linking
|
|
ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
|
|
$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)
|