github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 21:33:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract StormLib building from soh to ZAPDTR (#505)

Browse source 
* Extract StormLib building from soh to ZAPDTR

ZAPDTR is currently where we have everything… though this might not make the most sense.

* Do not import storm as a relative
This commit is contained in:
David Chavez 2022-06-20 19:38:08 +02:00 • committed by GitHub
commit a142d94c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/Makefile
View file

@ -7,6 +7,7 @@ ZAPD := ../ZAPDTR/ZAPD.out
LIBULTRASHIP := ../libultraship/libultraship.a
ZAPDUTILS := ../ZAPDTR/ZAPDUtils/ZAPDUtils.a
LIBSTORM := ../StormLib/build/libstorm.a
ASAN ?= 0
DEBUG ?= 1
@ -56,12 +57,12 @@ INC_DIRS := $(addprefix -I, \
)
LDDIRS := $(addprefix -L, \
../StormLib/build \
../libultraship/ \
)
LDLIBS := \
$(ZAPDUTILS) \
$(LIBSTORM) \
$(addprefix -l, \
X11 \
dl \
@ -72,7 +73,6 @@ LDLIBS := \
SDL2 \
GL \
GLEW \
storm \
pulse\
ultraship \
) \
@ -127,8 +127,6 @@ setup:
$(MAKE) mpq
mpq:
cmake -B ../StormLib/build -S ../StormLib
cmake --build ../StormLib/build
$(MAKE) -C ../libultraship
$(MAKE) -C ../OTRExporter/OTRExporter
$(MAKE) -C ../ZAPDTR
@ -141,7 +139,6 @@ distclean: clean
$(MAKE) clean -C ../libultraship
$(MAKE) clean -C ../OTRExporter/OTRExporter
$(MAKE) clean -C ../ZAPDTR
rm -rf ../StormLib/build
clean:
rm -rf build $(TARGET)