mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extract StormLib building from soh to ZAPDTR (#505) 

* 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
parent 4e75488567
commit a142d94c36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ZAPDTR/Makefile
View File

@ -103,6 +103,7 @@ clean:
$(MAKE) -C lib/libgfxd clean $(MAKE) -C lib/libgfxd clean
$(MAKE) -C ZAPDUtils clean $(MAKE) -C ZAPDUtils clean
$(MAKE) -C ExporterTest clean $(MAKE) -C ExporterTest clean
rm -rf ../StormLib/build
rebuild: clean all rebuild: clean all
@ -121,6 +122,11 @@ build/%.o: %.cpp
lib/libgfxd/libgfxd.a: lib/libgfxd/libgfxd.a:
$(MAKE) -C lib/libgfxd $(MAKE) -C lib/libgfxd
.PHONY: StormLib
StormLib:
LDFLAGS="" cmake -B ../StormLib/build -S ../StormLib
LDFLAGS="" cmake --build ../StormLib/build
.PHONY: ExporterTest .PHONY: ExporterTest
ExporterTest: ExporterTest:
$(MAKE) -C ExporterTest $(MAKE) -C ExporterTest
@ -131,5 +137,5 @@ ZAPDUtils:
# Linking # Linking
ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION) $(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)

7
soh/Makefile
View File

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