Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'windows_build_script' into ci_build

This commit is contained in:
Andrew Tonner 2017-01-22 23:26:46 -08:00
parent 902450a6e7 3a742ae3f2
commit 36bddb6ded
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SheepShaver/src/Windows/build_on_msys.py
View File

@ -304,11 +304,6 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit
unix_dir = os.path.join(sheepshaver_dir, "src", "Unix")
with dep_tracker.rebuilding_if_needed("sheepshaver_autogen", ["configure.ac"],
base_dir=script_path) as needs_rebuild:
if needs_rebuild:
run([msys_bash, os.path.join(unix_dir, "autogen.sh")], cwd=script_path, env=autogen_env)
ln_cmd = os.path.join(msys_bin_dir, "ln.exe")
windows_m4_dir = os.path.join(script_path, "m4")
@ -316,6 +311,11 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit
run([ln_cmd, "-sf", os.path.join(unix_dir, "m4"), windows_m4_dir],
cwd=script_path, env=autogen_env)
with dep_tracker.rebuilding_if_needed("sheepshaver_autogen", ["configure.ac"],
base_dir=script_path) as needs_rebuild:
if needs_rebuild:
run([msys_bash, os.path.join(unix_dir, "autogen.sh")], cwd=script_path, env=autogen_env)
configure_macemu_env = dict(our_env)
configure_macemu_env["CC"] = "gcc %s" % MACEMU_CFLAGS
configure_macemu_env["CXX"] = "g++ %s" % MACEMU_CXXFLAGS