diff options
| author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-28 13:07:33 +0000 |
|---|---|---|
| committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-08-28 13:07:33 +0000 |
| commit | 7bc1f5ba6b2055303264881afda118fd57b95963 (patch) | |
| tree | 5d6b13bf36ee651b23447dabd6513662a50f66bb /code/unix/Conscript-client | |
| parent | 4574351ba3c210a6a36ecc472a7ecc7e159bbde0 (diff) | |
| download | ioquake3-aero-7bc1f5ba6b2055303264881afda118fd57b95963.tar.gz ioquake3-aero-7bc1f5ba6b2055303264881afda118fd57b95963.zip | |
try to fix build using cons
git-svn-id: svn://svn.icculus.org/quake3/trunk@20 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix/Conscript-client')
| -rwxr-xr-x | code/unix/Conscript-client | 22 |
1 files changed, 20 insertions, 2 deletions
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 |