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
|
Respect env build settings, dont force crappy flags, and make sure -rpath is added properly.
--- SConstruct
+++ SConstruct
@@ -81,16 +81,10 @@
if env['gcc_visibility']:
env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden ');
env.Append(CPPFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden ');
- if debug:
- env.Append(CCFLAGS='-ggdb ')
- env.Append(CPPFLAGS='-ggdb ')
- else:
- env.Append(CCFLAGS='-O3 ')
- env.Append(CPPFLAGS='-O3 ')
al_lib = 'openal'
- env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ')
- env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ')
+ env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pthread ')
+ env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pthread ')
conf_env = env.Copy()
--- SConscript
+++ SConscript
@@ -94,7 +94,7 @@
Import('lib_dir')
if sys.platform != 'win32':
- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt')
- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx')
+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt')
+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx')
bt_main = bt_env.Program('bt', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir])
|
GitWeb
