Skip to content

Commit e53b532

Browse files
committed
Ocarina of Time: remove 32 bit windows executables, as AP never supported it
1 parent 25bbbdb commit e53b532

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

setup.py

+3
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ def installfile(path, keep_content=False):
162162
os.system(signtool + os.path.join(buildfolder, exe.target_name))
163163
print(f"Signing SNI")
164164
os.system(signtool + os.path.join(buildfolder, "SNI", "SNI.exe"))
165+
print(f"Signing OoT Utils")
166+
for exe_path in (("Compress", "Compress.exe"), ("Decompress", "Decompress.exe")):
167+
os.system(signtool + os.path.join(buildfolder, "lib", "worlds", "oot", "data", *exe_path))
165168

166169
remove_sprites_from_folder(buildfolder / "data" / "sprites" / "alttpr")
167170

worlds/oot/Rom.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,11 @@ def decompress_rom_file(self, file, decomp_file):
8888
raise RuntimeError('ROM file %s is not a valid OoT 1.0 US ROM.' % file)
8989
elif len(self.buffer) == 0x2000000:
9090
# If Input ROM is compressed, then Decompress it
91-
subcall = []
9291

9392
sub_dir = data_path("Decompress")
9493

9594
if platform.system() == 'Windows':
96-
if 8 * struct.calcsize("P") == 64:
97-
subcall = [sub_dir + "\\Decompress.exe", file, decomp_file]
98-
else:
99-
subcall = [sub_dir + "\\Decompress32.exe", file, decomp_file]
95+
subcall = [sub_dir + "\\Decompress.exe", file, decomp_file]
10096
elif platform.system() == 'Linux':
10197
if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64':
10298
subcall = [sub_dir + "/Decompress_ARM64", file, decomp_file]
@@ -288,10 +284,7 @@ def compress_rom_file(input_file, output_file):
288284
compressor_path = data_path("Compress")
289285

290286
if platform.system() == 'Windows':
291-
if 8 * struct.calcsize("P") == 64:
292-
compressor_path += "\\Compress.exe"
293-
else:
294-
compressor_path += "\\Compress32.exe"
287+
compressor_path += "\\Compress.exe"
295288
elif platform.system() == 'Linux':
296289
if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64':
297290
compressor_path += "/Compress_ARM64"
-54 KB
Binary file not shown.
-20 KB
Binary file not shown.

0 commit comments

Comments
 (0)