From 7bc1f5ba6b2055303264881afda118fd57b95963 Mon Sep 17 00:00:00 2001
From: ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Sun, 28 Aug 2005 13:07:33 +0000
Subject: try to fix build using cons

git-svn-id: svn://svn.icculus.org/quake3/trunk@20 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/unix/Conscript-client    | 22 ++++++++++++++++++++--
 code/unix/Conscript-dedicated | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'code/unix')

diff --git a/code/unix/Conscript-client b/code/unix/Conscript-client
index 59173af..0765beb 100755
--- a/code/unix/Conscript-client
+++ b/code/unix/Conscript-client
@@ -153,7 +153,7 @@ $env = new cons(
   . $BUILD_DIR . '/unix/asmlib.a '
   . $BUILD_DIR . '/unix/inlinelib.a '
 	. $BASE_LDFLAGS
-  . '-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -ldl -lm'
+  . '-L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -ldl -lm'
 );
 
 @RENDERER_FILES = qw(
@@ -253,9 +253,27 @@ $SERVER_REF = \@SERVER_FILES;
 # FIXME TTimo vm_<cpu>.c
 @VM_FILES = qw(
   ../qcommon/vm.c
-  ../qcommon/vm_x86.c
   ../qcommon/vm_interpreted.c
   );
+
+if ($cpu eq 'i386')
+{
+  push @VM_FILES, qw(
+    ../qcommon/vm_x86.c
+    );
+}
+elsif ($cpu eq 'ppc')
+{
+  push @VM_FILES, qw(
+    ../qcommon/vm_ppc.c
+    );
+}
+else
+{
+  push @VM_FILES, qw(
+    ../qcommon/vm_none.c
+    );
+}
 $VM_REF = \@VM_FILES;
 
 # FIXME: import the CPU string to build the name of the target
diff --git a/code/unix/Conscript-dedicated b/code/unix/Conscript-dedicated
index 0c64f23..56bcec3 100755
--- a/code/unix/Conscript-dedicated
+++ b/code/unix/Conscript-dedicated
@@ -109,7 +109,26 @@ $env = new cons(
    );
 $FILESREF = \@FILES;
 
+if ($cpu eq 'i386')
+{
+  push @FILES, qw(
+    ../qcommon/vm_x86.c
+    );
+}
+elsif ($cpu eq 'ppc')
+{
+  push @FILES, qw(
+    ../qcommon/vm_ppc.c
+    );
+}
+else
+{
+  push @FILES, qw(
+    ../qcommon/vm_none.c
+    );
+}
+
 # DEDICATED_NAME is imported, holds the name of the target
 # wolfded.x86 usually
-Program $env $DEDICATED_NAME, '../qcommon/vm_x86.c', @$FILESREF;
+Program $env $DEDICATED_NAME, @$FILESREF;
 Install $env $INSTALL_DIR, $DEDICATED_NAME;
-- 
cgit v1.2.3