diff --git a/build/rules.mk b/build/rules.mk index a56ad5b6c..9089cebce 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -56,7 +56,7 @@ $(eval $(call rule_for, \ $(eval $(call rule_for, \ WINDRES, %.o, %.rc, \ - $$(WINDRES) $$< -Ioutput/release/simulator/windows -O coff -o $$@, \ + $$(WINDRES) $$(WRFLAGS) $$< -O coff -o $$@, \ global \ )) diff --git a/ion/src/simulator/windows/Makefile b/ion/src/simulator/windows/Makefile index 97a2001b3..12a4124ea 100644 --- a/ion/src/simulator/windows/Makefile +++ b/ion/src/simulator/windows/Makefile @@ -16,11 +16,14 @@ ion_src += ion/src/simulator/shared/dummy/telemetry_init.cpp ion_src += ion/src/shared/telemetry_console.cpp endif -LDFLAGS += -lgdiplus +# RC file dependencies +$(call object_for,ion/src/simulator/windows/resources.rc): WRFLAGS += -I $(BUILD_DIR) -# The header is refered to as so make sure it's findable this way +# The header of images is refered to as so make sure it's findable this way SFLAGS += -I$(BUILD_DIR) +LDFLAGS += -lgdiplus + $(eval $(call rule_for, \ WINDOWS_ASSETS, \ ion/src/simulator/windows/resources.h, \