Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FreeBSD compatibility #337

Merged
merged 1 commit into from
Jan 19, 2025
Merged

Add FreeBSD compatibility #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,15 @@ ifneq (,$(findstring Darwin,$(UNAME_S)))
NATIVE := native_macos.ini
CROSS := cross_unix.ini
else
ifneq (,$(findstring BSD, $(UNAME_S)))
NATIVE := native_unix.ini
CROSS := cross_unix.ini
else
NATIVE := native.ini
CROSS := cross.ini
endif
endif
endif

export LM_LICENSE_FILE ?= $(WRAP)/license.dat
export NINJA_STATUS := [%p %f/%t]
Expand Down
7 changes: 3 additions & 4 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,6 @@ pokeplatinum_nds = custom_target('pokeplatinum.us.nds',
nitrofs_files # Make sure this is always listed last
],
command : [
'sh', '-c',
'"$@" && @INPUT6@ @OUTPUT0@ --secure-crc 0xF8B8 --game-code CPUE',
'--',
makerom_exe,
'-DTITLE_NAME=POKEMON PL',
'-DBNR=@INPUT1@',
Expand All @@ -235,7 +232,9 @@ pokeplatinum_nds = custom_target('pokeplatinum.us.nds',
'-DARM7_DEFS=@INPUT5@',
'@INPUT3@',
'@OUTPUT0@',
'@OUTPUT1@'
'@OUTPUT1@',
'&&','sh', '-c',
'@INPUT6@ @OUTPUT0@ --secure-crc 0xF8B8 --game-code CPUE'
],
build_by_default: true
)
Expand Down
4 changes: 1 addition & 3 deletions res/text/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,9 +723,7 @@ gmm_header_dir = custom_target('gmm_header_dir',
capture: true,
output: 'gmm_header_dir',
command: [
'sh', '-c', '"$@"',
'--',
'mkdir', '-p', gmm_header_target
'sh', '-c', 'mkdir -p ' + gmm_header_target
]
)

Expand Down