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 | 0751132ccdb0051f3eadd1991e6078915e3e7483 (patch) | |
| tree | 65e7b1b00914b481f079049efed37ccf49cc1a21 | |
| parent | 34f8326fe74ffc32afb99a16b612562401a0754b (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
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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) |