mirror of
https://github.com/PrimeDecomp/prime.git
synced 2025-12-09 07:07:41 +00:00
Merge branch 'link-order'
This commit is contained in:
15
configure.py
15
configure.py
@@ -15,8 +15,10 @@
|
||||
import argparse
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import List, Sequence, Union
|
||||
|
||||
from tools.project import (
|
||||
BuildConfigUnit,
|
||||
Object,
|
||||
ProgressCategory,
|
||||
ProjectConfig,
|
||||
@@ -767,6 +769,7 @@ config.libs = [
|
||||
Object(NonMatching, "MetroidPrime/ScriptObjects/CEnergyBall.cpp"),
|
||||
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/Enemies/CMetroidPrimeProjectile.cpp"),
|
||||
Object(MatchingFor("GM8E01_00", "GM8E01_01"), "MetroidPrime/Enemies/SPositionHistory.cpp"),
|
||||
Object(Equivalent, "dummy.c"),
|
||||
],
|
||||
),
|
||||
RetroLib(
|
||||
@@ -1414,6 +1417,18 @@ for lib in config.libs:
|
||||
obj.options["extra_clang_flags"].append("-Wno-return-type")
|
||||
|
||||
|
||||
def link_order_callback(
|
||||
module_id: int, units: List[str]
|
||||
) -> Sequence[Union[str, BuildConfigUnit]]:
|
||||
if module_id == 0: # DOL
|
||||
return units + [
|
||||
{"object": "dummy.o", "name": "dummy.c", "autogenerated": False}
|
||||
]
|
||||
return units
|
||||
|
||||
|
||||
config.link_order_callback = link_order_callback
|
||||
|
||||
# Optional extra categories for progress tracking
|
||||
config.progress_categories = [
|
||||
ProgressCategory("game", "Game"),
|
||||
|
||||
Reference in New Issue
Block a user