|
Lines 1-7
Link Here
|
| 1 |
--- SConstruct.orig 2016-06-24 12:15:47 UTC |
1 |
--- SConstruct.orig 2019-09-28 17:59:47 UTC |
| 2 |
+++ SConstruct |
2 |
+++ SConstruct |
| 3 |
@@ -24,7 +24,7 @@ Help(opts.GenerateHelpText(env)) |
3 |
@@ -2,6 +2,8 @@ import os |
| 4 |
|
4 |
|
|
|
5 |
# Load environment variables, including some that should be renamed. |
| 6 |
env = Environment(ENV = os.environ) |
| 7 |
+if 'CXX' in os.environ: |
| 8 |
+ env['CXX'] = os.environ['CXX'] |
| 9 |
if 'CXXFLAGS' in os.environ: |
| 10 |
env.Append(CCFLAGS = os.environ['CXXFLAGS']) |
| 11 |
if 'LDFLAGS' in os.environ: |
| 12 |
@@ -22,7 +24,7 @@ Help(opts.GenerateHelpText(env)) |
| 13 |
|
| 5 |
flags = ["-std=c++11", "-Wall"] |
14 |
flags = ["-std=c++11", "-Wall"] |
| 6 |
if env["mode"] != "debug": |
15 |
if env["mode"] != "debug": |
| 7 |
- flags += ["-O3"] |
16 |
- flags += ["-O3"] |
|
Lines 9-15
Link Here
|
| 9 |
if env["mode"] == "debug": |
18 |
if env["mode"] == "debug": |
| 10 |
flags += ["-g"] |
19 |
flags += ["-g"] |
| 11 |
if env["mode"] == "profile": |
20 |
if env["mode"] == "profile": |
| 12 |
@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("b |
21 |
@@ -57,7 +59,7 @@ sky = env.Program("endless-sky", Glob(buildDirectory + |
| 13 |
|
22 |
|
| 14 |
|
23 |
|
| 15 |
# Install the binary: |
24 |
# Install the binary: |
|
Lines 18-24
Link Here
|
| 18 |
|
27 |
|
| 19 |
# Install the desktop file: |
28 |
# Install the desktop file: |
| 20 |
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") |
29 |
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") |
| 21 |
@@ -80,7 +80,7 @@ if env.get("PREFIX").startswith("/usr/") |
30 |
@@ -85,7 +87,7 @@ if env.get("PREFIX").startswith("/usr/"): |
| 22 |
|
31 |
|
| 23 |
# Install the man page. |
32 |
# Install the man page. |
| 24 |
env.Command( |
33 |
env.Command( |
|
Lines 27-33
Link Here
|
| 27 |
"endless-sky.6", |
36 |
"endless-sky.6", |
| 28 |
"gzip -c $SOURCE > $TARGET") |
37 |
"gzip -c $SOURCE > $TARGET") |
| 29 |
|
38 |
|
| 30 |
@@ -93,11 +93,11 @@ def RecursiveInstall(env, target, source |
39 |
@@ -98,11 +100,11 @@ def RecursiveInstall(env, target, source): |
| 31 |
RecursiveInstall(env, os.path.join(target, name), node.abspath) |
40 |
RecursiveInstall(env, os.path.join(target, name), node.abspath) |
| 32 |
else: |
41 |
else: |
| 33 |
env.Install(target, node) |
42 |
env.Install(target, node) |