diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile index 957600ac1..50387ed01 100644 --- a/ion/src/simulator/linux/Makefile +++ b/ion/src/simulator/linux/Makefile @@ -41,6 +41,6 @@ $(eval $(call rule_for, \ assets_address_ranges_declaration = $(foreach i,$(jpg_assets),extern unsigned char _ion_simulator_$(i)_start;) assets_address_ranges_declaration += $(foreach i,$(jpg_assets),extern unsigned char _ion_simulator_$(i)_end;) -assets_address_ranges_definition = $(foreach i,$(jpg_assets), {"$(i).jpg", _ion_simulator_$(i)_start, _ion_simulator_$(i)_end},) +assets_address_ranges_definition = $(foreach i,$(jpg_assets), {"$(i).jpg", &_ion_simulator_$(i)_start, &_ion_simulator_$(i)_end},) $(call object_for,ion/src/simulator/linux/images.cpp): CXXFLAGS += -DASSETS_ADDRESS_RANGES_DECLARATION='$(assets_address_ranges_declaration)' -DASSETS_ADDRESS_RANGES_DEFINITION='$(assets_address_ranges_definition)' diff --git a/ion/src/simulator/linux/images.cpp b/ion/src/simulator/linux/images.cpp index 66a73856d..48ac055c5 100644 --- a/ion/src/simulator/linux/images.cpp +++ b/ion/src/simulator/linux/images.cpp @@ -11,8 +11,8 @@ ASSETS_ADDRESS_RANGES_DECLARATION static struct { const char * identifier; - unsigned char start; - unsigned char end; + unsigned char * start; + unsigned char * end; } resources_addresses[] = { ASSETS_ADDRESS_RANGES_DEFINITION }; @@ -29,8 +29,8 @@ SDL_Texture * IonSimulatorLoadImage(SDL_Renderer * renderer, const char * identi for (size_t i = 0; i < sizeof(resources_addresses)/sizeof(resources_addresses[0]); i++) { if (strcmp(identifier, resources_addresses[i].identifier) == 0) { - jpegStart = &resources_addresses[i].start; - jpegSize = &resources_addresses[i].end - &resources_addresses[i].start; + jpegStart = resources_addresses[i].start; + jpegSize = resources_addresses[i].end - resources_addresses[i].start; break; } }