blob: 6743b25cb8ab89b41bfd2db1dcecc10d4dde6414 (
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
|
As it turns out, scons doesn't inherit environment variables by
default. Debugging this was very pleasant. -- oxij
diff --git a/SConstruct b/SConstruct
index 5c1e774..66aa4c8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,13 +5,11 @@ tools = ['default']
if os.name == 'nt':
tools = ['mingw']
-env = Environment(tools = tools)
+env = Environment(tools = tools, ENV = os.environ)
options_file = None
-if sys.platform == 'linux2':
- options_file = "linux"
-elif 'msvc' in env['TOOLS']:
+if 'msvc' in env['TOOLS']:
options_file = "msvc"
else:
options_file = "posix"
diff --git a/config_posix.py b/config_posix.py
index 2bb696c..eb4eb9b 100644
--- a/config_posix.py
+++ b/config_posix.py
@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall']
prefix = '/usr/local'
# libraries
-LIBS = ['lua', 'lualib', 'm']
+LIBS = ['lua', 'liblua', 'm']
|