ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2025-05-31 00:51:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

try to fix build using cons

Browse source
This commit is contained in:
Ludwig Nussel 2005-08-28 13:07:33 +00:00
parent 07af20b73b
commit c366bdea07
3 changed files with 59 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
code/unix/Conscript-client
View file

@ -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

21
code/unix/Conscript-dedicated
View file

@ -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;