Disable asm-processor by default #175
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cadmic
reviewed
Sep 4, 2024
Comment on lines
+900
to
+904
| link_built_obj = obj.completed(version) and ( | ||
| # Don't link asm_processor objects if asm_processor is disabled | ||
| config.asm_processor | ||
| or not obj.options["asm_processor"] | ||
| ) |
There was a problem hiding this comment.
this broke my brain. How about
link_built_obj = obj.completed(version)
# Don't link asm_processor objects if asm_processor is disabled
if obj.options["asm_processor"] and not config.asm_processor:
link_built_obj = False| }) | ||
| unit_config["metadata"].update( | ||
| { | ||
| "complete": obj.completed(version) and not obj.options["asm_processor"], |
There was a problem hiding this comment.
what exactly does "complete" mean? should this use the same logic as link_built_obj?
Yanis002
reviewed
Sep 4, 2024
There was a problem hiding this comment.
building with --non-matching seems to fail (maybe windows only?)
PS F:\github\oot-gc> python configure.py --non-matching
PS F:\github\oot-gc> ninja
[1/154] MWCC build\ce-j\src\emulator\mcardGCN.o
FAILED: build/ce-j/src/emulator/mcardGCN.o
set "BINUTILS_PATH=build\binutils" && sh tools/asm_processor/compile.sh "build\tools\sjiswrap.exe build\compilers\GC\1.1\mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto -nodefaults -msgstyle gcc -sym on -i include -i libc -DNON_MATCHING -DASM_PROCESSOR -inline deferred -i build/ce-j/include -DVERSION=CE_J -MMD" "build\binutils\powerpc-eabi-as.exe -mgekko -I include -I libc" src\emulator\mcardGCN.c build\ce-j\src\emulator\mcardGCN.o
CreateProcess failed: The system cannot find the file specified.
[2/154] MWCC build\ce-j\src\emulator\frame.o
FAILED: build/ce-j/src/emulator/frame.o
set "BINUTILS_PATH=build\binutils" && sh tools/asm_processor/compile.sh "build\tools\sjiswrap.exe build\compilers\GC\1.1\mwcceppc.exe -Cpp_exceptions off -proc gekko -fp hardware -fp_contract on -enum int -align powerpc -nosyspath -RTTI off -str reuse -multibyte -O4,p -inline auto -nodefaults -msgstyle gcc -sym on -i include -i libc -DNON_MATCHING -DASM_PROCESSOR -inline deferred -i build/ce-j/include -DVERSION=CE_J -MMD" "build\binutils\powerpc-eabi-as.exe -mgekko -I include -I libc" src\emulator\frame.c build\ce-j\src\emulator\frame.o
CreateProcess failed: The system cannot find the file specified.
[14/154] MWCC build\ce-j\src\emulator\THPVideoDecode.oninja: fatal: ReadFile: GetLastError() = 6
| @@ -136,6 +136,7 @@ | |||
| config.generate_map = args.map | |||
| config.sjiswrap_path = args.sjiswrap | |||
| config.non_matching = args.non_matching | |||
| config.asm_processor = args.non_matching | |||
There was a problem hiding this comment.
I think it's odd to use args.non_matching to set the asm_processor variable
thinking about it more, it makes sense but idk it looks weird but feel free to ignore
|
superseded by #185 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With
--non-matching, asm-processor is enabled to allow modding builds. CI runs both matching and non-matching builds.