--- games-strategy/0ad/0ad-0.0.23b_alpha.ebuild +++ games-strategy/0ad/0ad-0.0.23b_alpha.ebuild @@ -22,6 +22,7 @@ RESTRICT="test" RDEPEND=" + dev-lang/spidermonkey:38 dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium @@ -63,6 +64,7 @@ local myconf=( --with-system-nvtt --with-system-miniupnpc + --with-system-mozjs38 --minimal-flags $(usex nvtt "" "--without-nvtt") $(usex pch "" "--without-pch") @@ -100,15 +102,12 @@ src_compile() { tc-export AR - # build bundled and patched spidermonkey - cd libraries/source/spidermonkey || die - JOBS="${MAKEOPTS}" ./build.sh || die - cd "${S}" || die - # build 3rd party fcollada emake -C libraries/source/fcollada/src # build 0ad + CFLAGS="${CFLAGS} -I/usr/include/mozjs-38/" + CXXFLAGS="${CXXFLAGS} -I/usr/include/mozjs-38/" emake -C build/workspaces/gcc verbose=1 } @@ -126,7 +125,6 @@ exeinto /usr/$(get_libdir)/${PN} doexe binaries/system/libCollada.so - doexe libraries/source/spidermonkey/lib/*.so use editor && doexe binaries/system/libAtlasUI.so dodoc binaries/system/readme.txt