1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Change the definition DLL_ONLY -> NO_VM_COMPILED for architectures which do

not have a VM compiler in SCons files to match sources. This should fix
  compilation on these architectures (others than i386, amd64 and powerpc).

Reported by:	pointyhat
This commit is contained in:
Alejandro Pulver 2007-06-05 02:50:04 +00:00
parent afdd4659d0
commit d5c0032c65
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192789
2 changed files with 8 additions and 6 deletions

View File

@ -1,5 +1,5 @@
--- SConscript_quake3.orig Fri Apr 20 17:28:47 2007
+++ SConscript_quake3 Fri Apr 20 17:51:18 2007
--- SConscript_quake3.orig Mon Jun 4 23:40:27 2007
+++ SConscript_quake3 Mon Jun 4 23:44:57 2007
@@ -1,4 +1,4 @@
-import os, string, sys
+import os, string, sys, fnmatch
@ -26,9 +26,10 @@
+ if env['vm'] != 0 and env['vm_archs'].count(env['arch']) > 0:
+ vm_src += ['engine/qcommon/vm_' + env['arch'] + '.c']
else:
quake3_env.Append(CCFLAGS='-DDLL_ONLY')
- quake3_env.Append(CCFLAGS='-DDLL_ONLY')
-
- if env['smp'] == 1:
+ quake3_env.Append(CCFLAGS='-DNO_VM_COMPILED')
+
+ if env['smp'] != 0:
quake3_env.Append(CCFLAGS='-DSMP')

View File

@ -1,5 +1,5 @@
--- SConscript_quake3-server.orig Tue Apr 17 00:09:21 2007
+++ SConscript_quake3-server Tue Apr 17 00:10:29 2007
--- SConscript_quake3-server.orig Mon Jun 4 23:40:27 2007
+++ SConscript_quake3-server Mon Jun 4 23:45:22 2007
@@ -1,4 +1,4 @@
-import os, string, sys
+import os, string, sys, fnmatch
@ -43,7 +43,8 @@
+ if env['vm'] != 0 and env['vm_archs'].count(env['arch']) > 0:
+ vm_src += ['engine/qcommon/vm_' + env['arch'] + '.c']
else:
quake3_server_env.Append(CCFLAGS='-DDLL_ONLY')
- quake3_server_env.Append(CCFLAGS='-DDLL_ONLY')
+ quake3_server_env.Append(CCFLAGS='-DNO_VM_COMPILED')
- quake3_server_env.Append(LIBS=['dl', 'm'])
- quake3_server_env.Program('quake3-server.x86', [quake3_server_src, unix_src, linux_src, vm_src])