mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-25 07:22:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set license file path correctly for cmd /c shell

Browse Source
This commit is contained in:
Aetias
2024-09-18 19:28:49 +02:00
parent db2b3f79c7
commit ca938e9c31
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/configure.py
+4 -6
View File
@@ -65,18 +65,16 @@ CC_INCLUDES = " ".join(f"-i {include}" for include in includes)
# Platform info
EXE = ""
WINE = ""
SHELL = ""
MW_LICENSE_SHELL = ""
system = platform.system()
if system == "Windows" or system.startswith("MSYS_NT"):
system = "windows"
EXE = ".exe"
SHELL = "cmd /c"
MW_LICENSE_SHELL = f"{SHELL} set LM_LICENSE_FILE={mw_license_path} &&"
MW_LICENSE_SHELL = lambda cmd: f'cmd /s /c "set LM_LICENSE_FILE="{mw_license_path}" && cmd /s /c "&& {cmd}""'
elif system == "Linux":
system = "linux"
WINE = "wine"
MW_LICENSE_SHELL = f"LM_LICENSE_FILE={mw_license_path}"
MW_LICENSE_SHELL = lambda cmd: f"LM_LICENSE_FILE={mw_license_path} {cmd}"
else:
print(f"Unknown system '{system}'")
exit(1)
@@ -105,7 +103,7 @@ def main():
n.rule(
name="mwcc",
command=f'{MW_LICENSE_SHELL} {WINE} "{mwcc_path}/mwccarm.exe" {CC_FLAGS} {CC_INCLUDES} $cc_flags -d $game_code $in -o $out'
command=MW_LICENSE_SHELL(f'{WINE} "{mwcc_path}/mwccarm.exe" {CC_FLAGS} {CC_INCLUDES} $cc_flags -d $game_code $in -o $out')
)
n.newline()
@@ -117,7 +115,7 @@ def main():
n.rule(
name="mwld",
command=f'{MW_LICENSE_SHELL} {WINE} "{mwcc_path}/mwldarm.exe" {LD_FLAGS} @$objects_file $lcf_file -o $out'
command=MW_LICENSE_SHELL(f'{WINE} "{mwcc_path}/mwldarm.exe" {LD_FLAGS} @$objects_file $lcf_file -o $out')
)
n.newline()