izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #182 from FazanaJ/makefile-dependancies

Browse Source 
Update Makefile
This commit is contained in:
Ryan Myers
2021-12-06 21:09:57 -05:00
committed by GitHub
parent 3058abaaff a70af4d7af
commit 8515a2acee
3 changed files with 97 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+30 -4
View File
@@ -136,11 +136,18 @@ CC := $(RECOMP_DIR)cc
CPP := cpp -P -Wno-trigraphs
LD = $(CROSS)ld
OBJDUMP = $(CROSS)objdump
OBJCOPY = $(CROSS)objcopy --pad-to=0xC00000 --gap-fill=0xFF
# Pad to 12MB if matching, otherwise build to a necessary minimum of 1.04KB
ifeq ($(NON_MATCHING),0)
OBJCOPY = $(CROSS)objcopy --pad-to=0xC00000 --gap-fill=0xFF
else
OBJCOPY = $(CROSS)objcopy --pad-to=0x101000 --gap-fill=0xFF
endif
MIPSISET := -mips1
OPT_FLAGS := -O2
INCLUDE_DIRS := include $(BUILD_DIR) $(BUILD_DIR)/include src include/libc .
C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
@@ -178,6 +185,17 @@ C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)*.c))
# Object files
O_FILES := $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
$(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o))
# Automatic dependency files
DEP_FILES := $(O_FILES:.o=.d) $(BUILD_DIR)/$(LD_SCRIPT).d
# Check code syntax with host compiler
CC_CHECK := gcc
ifeq ($(shell getconf LONG_BIT), 64)
# Ensure that gcc treats the code as 32-bit
CC_CHECK_CFLAGS += -m32
endif
CC_CHECK_CFLAGS := -fsyntax-only -fsigned-char $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB -D_LANGUAGE_C
####################### ASSETS #########################
@@ -461,11 +479,17 @@ $(UCODE_OUT_DIR)/%.bin: $(UCODE_IN_DIR)/%.bin
$(BUILD_DIR)/%.o: %.s | $(ALL_ASSETS_BUILT)
$(call print,Assembling:,$<,$@)
$(V)$(AS) $(ASFLAGS) -o $@ $<
$(V)$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $<
$(BUILD_DIR)/%.o: %.c | $(ALL_ASSETS_BUILT)
$(call print,Compiling:,$<,$@)
$(V)$(CC) $(CFLAGS) -o $@ $<
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c | $(ALL_ASSETS_BUILT)
$(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) | $(ALL_ASSETS_BUILT)
$(call print,Preprocessing linker script:,$<,$@)
@@ -511,3 +535,5 @@ load: $(BUILD_DIR)/$(TARGET).z64
# Remove built-in rules, to improve performance
MAKEFLAGS += --no-builtin-rules
-include $(DEP_FILES)
tools/python/generate_assets.py
+29 -21
View File
@@ -2,6 +2,7 @@ import sys
import json
import re
import os
import hashlib
from file_util import FileUtil
@@ -16,27 +17,34 @@ class GenerateAssets:
self.UCODE_TEXT_FILENAME = rootDir + '/asm/assets/ucode_text.s'
self.UCODE_DATA_FILENAME = rootDir + '/asm/assets/ucode_data.s'
self.BUILD_DIR = rootDir + '/build/' + version
self.generate_assets_file()
self.generate_ucode_files()
def generate_assets_file(self):
with open(self.ASSETS_DIR + '/assets.json') as jsonFile:
with open(self.ASSETS_DIR + '/md5.txt', 'w') as a_file:
with open(self.ASSETS_DIR + '/assets.json',"rb") as f:
bytes = f.read() # read file as bytes
readable_hash = hashlib.md5(bytes).hexdigest();
a_file.write(readable_hash)
assetsJSON = json.load(jsonFile)
assets = assetsJSON['assets']
self.generate_asset_sections_header_file(assets)
assetsTextFinal = '# This file was generated by generate_ld.py\n\n'
assetsTextFinal += '.include "macros.inc"\n\n'
assetsText = 'glabel ASSETS_START\n\n'
assetSectionTexts = [''] * len(assets)
numAssets = len(assets)
self.numAssets = numAssets
for i in range(0, numAssets):
assetSectionTexts[i] = 'glabel ASSET_SECTION_' + str(i) + '\n'
for i in range(0, numAssets):
@@ -51,9 +59,9 @@ class GenerateAssets:
assetSectionTexts[tableIndex] += '.word ASSET_SECTION_' + str(i) + '_END - ASSET_SECTION_' + str(i) + '\n'
assetSectionTexts[tableIndex] += '.word 0xFFFFFFFF\n'
continue
folder = self.BUILD_DIR + '/' + assets[i]['folder']
numFiles = len(assets[i]['filenames'])
for j in range(0, numFiles):
assetSectionTexts[i] += 'glabel ASSET_' + str(i) + '_' + str(j) + '\n'
@@ -61,26 +69,26 @@ class GenerateAssets:
if not filename.endswith('.bin'):
filename = os.path.splitext(filename)[0] + '.bin'
assetSectionTexts[i] += '.incbin "' + filename + '"\n'
if 'table' in assets[i]:
assetSectionTexts[assets[i]['table']] += self.generate_asset_table(i, assets[i], assetType, numFiles)
for i in range(0, numAssets):
assetSectionTexts[i] += 'glabel ASSET_SECTION_' + str(i) + '_END\n'
for assetSectionText in assetSectionTexts:
assetsText += '.balign 16\n' + assetSectionText + '\n'
assetsText += '.balign 16\nglabel ASSETS_END\n'
assetsTextFinal += '.word ' + str(numAssets) + ' # Number of asset sections \n'
for i in range(0, numAssets):
assetsTextFinal += '.word ASSET_SECTION_' + str(i) + ' - ASSETS_START\n'
assetsTextFinal += '.word ASSETS_END - ASSETS_START\n\n'
assetsTextFinal += assetsText
with open(self.ASSETS_FILENAME, "w") as assetsFile:
assetsFile.write(assetsTextFinal)
def generate_asset_table(self, i, asset, assetType, numFiles):
outText = ''
if assetType == 'TTGhosts':
@@ -122,7 +130,7 @@ class GenerateAssets:
assetsUCodeText += self.generate_ucode_file('rspUnknown2Start', 'ucode/ucode_unknown_2.bin')
with open(self.UCODE_TEXT_FILENAME, "w") as assetsFile:
assetsFile.write(assetsUCodeText)
assetsUCodeData = '# This file was generated by generate_ld.py\n\n'
assetsUCodeData += '.include "macros.inc"\n\n'
assetsUCodeData += self.generate_ucode_file('rspUnknownDataStart', 'ucode/data_unknown.bin')
@@ -130,21 +138,21 @@ class GenerateAssets:
assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataFifoStart', 'ucode/data_f3ddkr_fifo.bin')
assetsUCodeData += self.generate_ucode_file('rspF3DDKRDataXbusStart', 'ucode/data_f3ddkr_xbus.bin')
assetsUCodeData += self.generate_ucode_file('rspUnknown2DataStart', 'ucode/data_unknown_2.bin')
with open(self.UCODE_DATA_FILENAME, "w") as assetsFile:
assetsFile.write(assetsUCodeData)
def generate_ucode_file(self, label, path):
return 'glabel ' + label + '\n.incbin "' + self.BUILD_DIR + '/' + path + '"\n'
def generate_asset_sections_header_file(self, assets):
out = '/* This file was generated by generate_ld.py */\n'
out += '\n#ifndef _ASSET_SECTIONS_H_\n#define _ASSET_SECTIONS_H_\n\n'
for i in range(0, len(assets)):
asset = assets[i]
out += '#define ASSET_' + asset['name'] + ' ' + str(i) + '\n'
out += '\n#endif\n'
with open(ASSETS_INCLUDE, "w") as assetSectionsFile:
assetSectionsFile.write(out)
tools/python/generate_ld.py
+38 -21
View File
@@ -1,6 +1,8 @@
import re
import os
import sys
import os.path
import hashlib
from file_util import FileUtil
from generate_assets import GenerateAssets
@@ -20,7 +22,7 @@ LIB_SRC_DIR = ROOT_DIR + '/lib/src'
DATA_DIR = ROOT_DIR + '/data'
BUILD_DIR = 'build/' + VERSION
LATE_DATA_FILES = [
LATE_DATA_FILES = [
BUILD_DIR + '/lib/src/al/alCopy.o',
BUILD_DIR + '/lib/src/libc/xprintf.o',
BUILD_DIR + '/lib/src/os/osTimer.o',
@@ -48,7 +50,7 @@ class GenerateLD:
self.gen_newline()
self.gen_sections()
print('\x1B[33m New linker file created!\x1B[0m')
def gen_sections(self):
self.gen_line('SECTIONS')
self.gen_open_block()
@@ -69,7 +71,7 @@ class GenerateLD:
self.gen_newline()
self.gen_discard()
self.gen_close_block()
def gen_boot_section(self):
self.gen_line('.boot 0 : AT(romPos)')
self.gen_open_block()
@@ -78,7 +80,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.boot);')
self.gen_newline()
def gen_main_section(self):
self.gen_line('.main __FUNC_RAM_START : AT(romPos) SUBALIGN(16)')
self.gen_open_block()
@@ -87,7 +89,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.main);')
self.gen_newline()
def gen_ucode_text_section(self):
self.gen_line('.ucodeText . : AT(romPos)')
self.gen_open_block()
@@ -95,7 +97,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.ucodeText);')
self.gen_newline()
def gen_data_section(self):
self.gen_line('.data . : AT(romPos) SUBALIGN(16)')
self.gen_open_block()
@@ -107,7 +109,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.data);')
self.gen_newline()
def gen_rodata_section(self):
self.gen_line('.rodata . : AT(romPos) SUBALIGN(16)')
self.gen_open_block()
@@ -128,7 +130,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.rodata);')
self.gen_newline()
def gen_ucode_data_section(self):
self.gen_line('.ucodeData . : AT(romPos)')
self.gen_open_block()
@@ -136,7 +138,7 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.ucodeData);')
self.gen_newline()
def gen_bss_section(self):
self.gen_line('__BSS_SECTION_SIZE = SIZEOF(.bss.noload) - 0x10;')
self.gen_newline()
@@ -149,7 +151,7 @@ class GenerateLD:
self.gen_line(file + '(.bss);')
self.gen_close_block()
self.gen_newline()
def gen_assets_section(self):
self.gen_line('__ASSETS_LUT_START = romPos;');
self.gen_line('__ASSETS_LUT_END = __ASSETS_LUT_START + ' + hex((((self.assets.numAssets + 2) * 4) + 15) & 0xFFFFFFF0) + ';');
@@ -160,28 +162,28 @@ class GenerateLD:
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.assets);')
self.gen_newline()
def gen_discard(self):
self.gen_comment('Discard everything not specifically mentioned above.')
self.gen_line('/DISCARD/ :')
self.gen_open_block()
self.gen_line('*(*);')
self.gen_close_block()
def increase_indent(self):
self.indentLevel += 1
def decrease_indent(self):
self.indentLevel -= 1
def gen_open_block(self):
self.gen_line('{')
self.increase_indent()
def gen_close_block(self):
self.decrease_indent()
self.gen_line('}')
def gen_line(self, text):
spaces = 4 * self.indentLevel
while spaces > 0:
@@ -189,7 +191,7 @@ class GenerateLD:
spaces -= 1
self.file.write(text)
self.gen_newline()
def gen_comment(self, text):
spaces = 4 * self.indentLevel
while spaces > 0:
@@ -197,10 +199,10 @@ class GenerateLD:
spaces -= 1
self.file.write('/* ' + text + ' */')
self.gen_newline()
def gen_newline(self):
self.file.write('\n')
def append_files(self, files, extensions, directory, outputDir):
filenames = FileUtil.get_filenames_from_directory_recursive(directory, extensions)
regex = r'[\/][*]+\s*RAM_POS:\s*0x([0-9a-fA-F]+)\s*[*]+[\/]'
@@ -226,5 +228,20 @@ class GenerateLD:
files.sort(key = lambda x: (x[2], x[3])) # Sort tuples by RAM address and prioritize src files first.
return files
with open(LD_NAME, 'w') as ldFile:
GenerateLD(ldFile)
if os.path.exists('./dkr.ld'):
print("")
else:
os.remove('./assets/' + VERSION + '/md5.txt')
if os.path.exists('./assets/' + VERSION + '/md5.txt'):
with open('./assets/' + VERSION + '/md5.txt', "rt") as a_file:
with open('./assets/' + VERSION + '/assets.json',"rb") as f:
bytes = f.read() # read file as bytes
readable_hash = hashlib.md5(bytes).hexdigest();
compare_hash = a_file.read().rstrip()
if compare_hash != readable_hash:
with open(LD_NAME, 'w') as ldFile:
GenerateLD(ldFile)
else:
with open(LD_NAME, 'w') as ldFile:
GenerateLD(ldFile)