mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Remove sed from ld_script, replace with INCLUDEs
This commit is contained in:
parent
935a098843
commit
7c57699fa5
2
Makefile
2
Makefile
@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
|
||||
$(RAMSCRGEN) ewram_data $< ENGLISH > $@
|
||||
|
||||
$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
|
||||
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
|
||||
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld
|
||||
|
||||
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
|
||||
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
|
||||
|
@ -1,14 +0,0 @@
|
||||
/<EWRAM>/ {
|
||||
r sym_ewram.ld
|
||||
d
|
||||
}
|
||||
|
||||
/<BSS>/ {
|
||||
r sym_bss.ld
|
||||
d
|
||||
}
|
||||
|
||||
/<COMMON>/ {
|
||||
r sym_common.ld
|
||||
d
|
||||
}
|
@ -13,7 +13,7 @@ SECTIONS {
|
||||
|
||||
. = 0x1C000;
|
||||
|
||||
<EWRAM>
|
||||
INCLUDE "sym_ewram.ld"
|
||||
|
||||
. = 0x40000;
|
||||
}
|
||||
@ -24,13 +24,13 @@ SECTIONS {
|
||||
ALIGN(4)
|
||||
{
|
||||
/* .bss starts at 0x3000000 */
|
||||
<BSS>
|
||||
INCLUDE "sym_bss.ld"
|
||||
|
||||
/* .bss.code starts at 0x3001AA8 */
|
||||
src/m4a_2.o(.bss.code);
|
||||
|
||||
/* COMMON starts at 0x30022A8 */
|
||||
<COMMON>
|
||||
INCLUDE "sym_common.ld"
|
||||
*libc.a:sbrkr.o(COMMON);
|
||||
end = .;
|
||||
. = 0x8000;
|
||||
|
Loading…
Reference in New Issue
Block a user