UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Linux: fix images: get the asset addresses instead of consecutive

Browse Source 
table addresses
This commit is contained in:
Émilie Feral
2020-09-11 13:54:10 +02:00
committed by EmilieNumworks
parent 2236dcdbed
commit 64bcbd708a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/src/simulator/linux/Makefile
View File

@@ -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)'

8
ion/src/simulator/linux/images.cpp
View File

@@ -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;
}
}