diff --git a/build/targets.blackbox.mak b/build/targets.blackbox.mak index 0018f811c..c1668c791 100644 --- a/build/targets.blackbox.mak +++ b/build/targets.blackbox.mak @@ -1,7 +1,6 @@ epsilon.$(EXE): $(objs) $(app_objs) $(app_image_objs) $(addprefix ion/src/blackbox/, boot.o events.o) products += $(addprefix ion/src/blackbox/, boot.o events.o) -products += $(wildcard libepsilon_*.dylib) products += $(wildcard ion/src/blackbox/library_*.o) ion/src/blackbox/library_%.o: SFLAGS += -D EPSILON_LIB_PREFIX=$(*F) @@ -9,11 +8,11 @@ ion/src/blackbox/library_%.o: ion/src/blackbox/library.cpp @echo "CXX $@" $(Q) $(CXX) $(SFLAGS) $(CXXFLAGS) -c $< -o $@ -libepsilon_%.dylib: LDFLAGS += -exported_symbols_list ion/src/blackbox/lib_export_list.txt -libepsilon_%.dylib: $(objs) $(app_objs) $(app_image_objs) ion/src/blackbox/library_%.o +libepsilon_%.o: LDFLAGS += -exported_symbols_list ion/src/blackbox/lib_export_list.txt +libepsilon_%.o: $(objs) $(app_objs) $(app_image_objs) ion/src/blackbox/library_%.o @echo "LD $@" - $(Q) $(LD) $^ $(LDFLAGS) -shared -s -o $@ + $(Q) $(LD) $^ $(LDFLAGS) -r -s -o $@ -compare.elf: ion/src/blackbox/compare.o libepsilon_first.dylib libepsilon_second.dylib +compare: ion/src/blackbox/compare.o libepsilon_first.o libepsilon_second.o @echo "LD $@" - $(Q) $(LD) $< $(LDFLAGS) -L. -lepsilon_first -lepsilon_second -o $@ + $(Q) $(LD) $^ $(LDFLAGS) -L. -o $@