Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-27 16:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'windows_build_script' into ci_build

Browse Source
This commit is contained in:
Andrew Tonner 2017-01-22 16:49:35 -08:00
commit 42d627ccb5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,9 @@ def parse_args():
parser.add_argument("--add-path", parser.add_argument("--add-path",
default=None, default=None,
help="Add something to the PATH used for builds, with highest priority") help="Add something to the PATH used for builds, with highest priority")
parser.add_argument("--build",
default=None,
help="Build platform to pass to configure scripts")
return parser.parse_args() return parser.parse_args()
@ -133,7 +136,7 @@ def log(msg):
def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit, debug_build, def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit, debug_build,
install_to_dir=None, add_path=None): install_to_dir=None, add_path=None, build=None):
root_dir = os.path.abspath(os.path.join(script_path, "..", "..", "..")) root_dir = os.path.abspath(os.path.join(script_path, "..", "..", ".."))
dep_tracker = BuildDepTracker(root_dir) dep_tracker = BuildDepTracker(root_dir)
@ -210,7 +213,10 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit
run([msys_bash, "./autogen.sh"], cwd=sdl_dir, env=our_env) run([msys_bash, "./autogen.sh"], cwd=sdl_dir, env=our_env)
with dep_tracker.rebuilding_if_needed("sdl_configure", "configure", base_dir=sdl_dir) as needs_rebuild: with dep_tracker.rebuilding_if_needed("sdl_configure", "configure", base_dir=sdl_dir) as needs_rebuild:
if needs_rebuild: if needs_rebuild:
run([msys_bash, "./configure", "--disable-shared", "--prefix=/usr"], cwd=sdl_dir, env=our_env) sdl_configure_args = [msys_bash, "./configure", "--disable-shared", "--prefix=/usr"]
if build is not None:
sdl_configure_args += ["--build", build]
run(sdl_configure_args, cwd=sdl_dir, env=our_env)
run([make_bin] + make_args + ["clean"], cwd=sdl_dir, env=our_env) run([make_bin] + make_args + ["clean"], cwd=sdl_dir, env=our_env)
run([make_bin] + make_args, cwd=sdl_dir, env=our_env) run([make_bin] + make_args, cwd=sdl_dir, env=our_env)
@ -644,9 +650,11 @@ def main():
if num_threads > 1: if num_threads > 1:
make_args.append("-j%d" % num_threads) make_args.append("-j%d" % num_threads)
log("Will install to %s" % options.install_to_dir) if options.install_to_dir is not None:
log("Will install to %s" % options.install_to_dir)
install(make_args, options.show_build_environment, options.use_precompiled_dyngen, options.build_jit, install(make_args, options.show_build_environment, options.use_precompiled_dyngen, options.build_jit,
options.debug_build, install_to_dir=options.install_to_dir, add_path=options.add_path) options.debug_build, install_to_dir=options.install_to_dir, add_path=options.add_path,
build=options.build)
if __name__ == "__main__": if __name__ == "__main__":