diff options
| author | David Chavez <david@dcvz.io> | 2022-06-20 19:38:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 13:38:08 -0400 |
| commit | a142d94c36f5aa0055cf62d28b4140106c5b7a6f (patch) | |
| tree | ff7b7db4190d89399b80e816921c5eaac4288e55 /ZAPDTR | |
| parent | 4e754885670f9ca4be663a6ce9d8f11da5bba08c (diff) | |
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
Diffstat (limited to 'ZAPDTR')
| -rw-r--r-- | ZAPDTR/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile index 8123f8162..9ff869f89 100644 --- a/ZAPDTR/Makefile +++ b/ZAPDTR/Makefile @@ -103,6 +103,7 @@ clean: $(MAKE) -C lib/libgfxd clean $(MAKE) -C ZAPDUtils clean $(MAKE) -C ExporterTest clean + rm -rf ../StormLib/build rebuild: clean all @@ -121,6 +122,11 @@ build/%.o: %.cpp 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 @@ -131,5 +137,5 @@ ZAPDUtils: # Linking -ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils - $(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION) +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) |