From 1161dfd002d4078da5b024088ac0abb1a526c233 Mon Sep 17 00:00:00 2001 From: Carl Myers Date: Mon, 28 Feb 2011 23:58:58 -0800 Subject: [PATCH] Some build-related fixes, dep update * Noted that autoconf tools are needed, v1.9 or older * Fixed build scripts to take a number to call `make -jX` --- build-arcade.sh | 7 ++++++- build-home.sh | 13 ++++++++++--- dependencies.txt | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/build-arcade.sh b/build-arcade.sh index 0ca3c67b..41516431 100755 --- a/build-arcade.sh +++ b/build-arcade.sh @@ -5,4 +5,9 @@ ./autogen.sh ./configure --with-x --with-gnu-ld --enable-itg-arcade --target=i386-pc-linux-gnu --host=i386-pc-linux-gnu -make +if [ "x$1" == "x" ]; +then + make +else + make -j$1 +fi diff --git a/build-home.sh b/build-home.sh index ca7cf2ab..ab8d9408 100755 --- a/build-home.sh +++ b/build-home.sh @@ -1,8 +1,15 @@ #!/bin/sh +# XXX: Move this to make land! +./generate-version ./autogen.sh -# TODO: make this actually build 64-bit -./configure --with-x --with-gnu-ld --target=i386-pc-linux-gnu --host=i386-pc-linux-gnu -make +#./configure --with-x --with-gnu-ld --target=i386-pc-linux-gnu --host=i386-pc-linux-gnu +./configure --with-x --with-gnu-ld +if [ "x$1" == "x" ]; +then + make +else + make -j$1 +fi diff --git a/dependencies.txt b/dependencies.txt index 87f22619..0986d38d 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -1,4 +1,5 @@ debian squeeze/sid packages: +automake1.9 # newer versions do not work! libsdl1.2-dev libglu1-mesa-dev # openGL library liblualib50-dev -- 2.11.0