Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mesa
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
virgl-es
mesa
Commits
ae760279
Commit
ae760279
authored
Feb 11, 2011
by
José Fonseca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scons: Try to support building 64bit binaries on 32bit windows.
parent
051f8bbf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
15 deletions
+22
-15
SConstruct
SConstruct
+1
-1
common.py
common.py
+2
-10
scons/gallium.py
scons/gallium.py
+18
-0
src/glsl/SConscript
src/glsl/SConscript
+1
-4
No files found.
SConstruct
View file @
ae760279
...
...
@@ -132,7 +132,7 @@ Export('env')
#
# Create host environent
if
env
[
'
platform'
]
!=
common
.
host_platform
:
if
env
[
'
crosscompile'
]
and
env
[
'platform'
]
!=
'embedded'
:
host_env
=
Environment
(
options
=
opts
,
# no tool used
...
...
common.py
View file @
ae760279
...
...
@@ -14,13 +14,7 @@ import SCons.Script.SConscript
#######################################################################
# Defaults
_platform_map
=
{
'linux2'
:
'linux'
,
'win32'
:
'windows'
,
}
host_platform
=
sys
.
platform
host_platform
=
_platform_map
.
get
(
host_platform
,
host_platform
)
host_platform
=
_platform
.
system
().
lower
()
# Search sys.argv[] for a "platform=foo" argument since we don't have
# an 'env' variable at this point.
...
...
@@ -29,8 +23,6 @@ if 'platform' in SCons.Script.ARGUMENTS:
else
:
target_platform
=
host_platform
cross_compiling
=
target_platform
!=
host_platform
_machine_map
=
{
'x86'
:
'x86'
,
'i386'
:
'x86'
,
...
...
@@ -52,7 +44,7 @@ host_machine = _machine_map.get(host_machine, 'generic')
default_machine
=
host_machine
default_toolchain
=
'default'
if
target_platform
==
'windows'
and
cross_compiling
:
if
target_platform
==
'windows'
and
host_platform
!=
'windows'
:
default_machine
=
'x86'
default_toolchain
=
'crossmingw'
...
...
scons/gallium.py
View file @
ae760279
...
...
@@ -35,6 +35,7 @@ import os
import
os.path
import
re
import
subprocess
import
platform
as
_platform
import
SCons.Action
import
SCons.Builder
...
...
@@ -191,6 +192,23 @@ def generate(env):
gcc
=
env
[
'gcc'
]
msvc
=
env
[
'msvc'
]
# Determine whether we are cross compiling; in particular, whether we need
# to compile code generators with a different compiler as the target code.
host_platform
=
_platform
.
system
().
lower
()
host_machine
=
os
.
environ
.
get
(
'PROCESSOR_ARCHITECTURE'
,
_platform
.
machine
())
host_machine
=
{
'x86'
:
'x86'
,
'i386'
:
'x86'
,
'i486'
:
'x86'
,
'i586'
:
'x86'
,
'i686'
:
'x86'
,
'ppc'
:
'ppc'
,
'x86_64'
:
'x86_64'
,
}.
get
(
host_machine
,
'generic'
)
env
[
'crosscompile'
]
=
platform
!=
host_platform
if
machine
==
'x86_64'
and
host_machine
!=
'x86_64'
:
env
[
'crosscompile'
]
=
True
# Backwards compatability with the debug= profile= options
if
env
[
'build'
]
==
'debug'
:
if
not
env
[
'debug'
]:
...
...
src/glsl/SConscript
View file @
ae760279
...
...
@@ -82,7 +82,7 @@ sources = [
]
if
env
[
'platform'
]
==
common
.
host_platform
:
if
not
env
[
'crosscompile'
]
or
env
[
'platform'
]
==
'embedded'
:
if
env
[
'msvc'
]:
env
.
Prepend
(
CPPPATH
=
[
'#/src/getopt'
])
env
.
PrependUnique
(
LIBS
=
[
getopt
])
...
...
@@ -105,9 +105,6 @@ if env['platform'] == common.host_platform:
Export
(
'builtin_glsl_function'
)
if
common
.
cross_compiling
:
Return
()
sources
+=
builtin_glsl_function
glsl
=
env
.
ConvenienceLibrary
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment