blob: 8ec4aa967b3227034c147d98b6e8d10cbb4cc48a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- code/Construct.orig Mon Aug 15 20:56:27 2005
+++ code/Construct Wed Nov 23 10:37:04 2005
@@ -19,8 +19,8 @@
use Cons_gcc;
# defaults
-$config = 'debug';
-$do_smp = 1;
+$config = 'release';
+$do_smp = 0;
$do_masterserver = 0;
$do_authserver = 0;
$do_authport = 0;
@@ -32,8 +32,8 @@
$DO_WIN32 = 0;
$NO_VM = 0;
$NO_SO = 0;
-$CC='gcc';
-$CXX='g++';
+$CC=$ENV{CC};
+$CXX=$ENV{CXX};
# detect an sdk build (don't attempt client build and other things)
if ( -r 'unix/Conscript-client' )
@@ -63,9 +63,9 @@
else
{
# libc .. do the little magic!
- $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
- $libc = `$libc_cmd`;
- chop ($libc);
+ # $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
+ # $libc = `$libc_cmd`;
+ # chop ($libc);
}
if ($DO_WIN32 eq 1)
@@ -227,7 +227,7 @@
# build the config directory
$CONFIG_DIR = $config . '-' . $cpu . '-' . $OS . '-' . $libc;
-$COMMON_CFLAGS = '-pipe -fsigned-char ';
+$COMMON_CFLAGS = '-pipe -fsigned-char -I/usr/local/include -L/usr/local/lib -I/usr/X11R6/include -L/usr/X11R6/lib ';
if ($config eq 'debug')
{
@@ -237,7 +237,7 @@
}
else
{
- $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
+ $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
}
@@ -287,11 +287,11 @@
system("mkdir qvmtools 2>/dev/null");
if (@_[0] eq 'q3lcc')
{
- system("cd ../lcc ; make all ; cp /tmp/lcc ../code/qvmtools/q3lcc ; cp /tmp/rcc ../code/qvmtools/q3rcc ; cp /tmp/cpp ../code/qvmtools/q3cpp");
+ system("cd ../lcc ; gmake all ; cp ../lcc/build/lcc ../code/qvmtools/q3lcc ; cp ../lcc/build/rcc ../code/qvmtools/q3rcc ; cp ../lcc/build/cpp ../code/qvmtools/q3cpp");
}
elsif (@_[0] eq 'q3asm')
{
- system("cd ../q3asm ; make ; cp q3asm ../code/qvmtools");
+ system("cd ../q3asm ; gmake ; cp q3asm ../code/qvmtools");
}
else
{
|
