Merge branch 'windows_build_script' into ci_build

2017-01-22 22:15:41 -08:00 · 2017-01-22 22:15:41 -08:00 · 71192179e5
parent dc2c146002 2f8c7f441c
commit 71192179e5
1 changed files with 2 additions and 0 deletions
--- a/SheepShaver/src/Windows/build_on_msys.py
+++ b/SheepShaver/src/Windows/build_on_msys.py
@ -208,7 +208,9 @@ def install(make_args, show_build_environment, use_precompiled_dyngen, build_jit
            run([gtk_install_filename, "/S", "/D=" + GTK_INSTALL_DIR], shell=True)

    gtk_pkg_config_path = os.path.join(GTK_INSTALL_DIR, "lib", "pkgconfig")
+    gtk_aclocal_path = os.path.join(GTK_INSTALL_DIR, "share", "aclocal")
    our_env["PKG_CONFIG_PATH"] = gtk_pkg_config_path
+    our_env["ACLOCAL_PATH"] = gtk_aclocal_path

    # build SDL