]>
Commit | Line | Data |
---|---|---|
52d053fe | 1 | Files aqsis-1.2.0.orig/.sconsign.dblite and aqsis-1.2.0/.sconsign.dblite differ |
dbdc7c2a | 2 | diff -Nru aqsis-1.2.0.orig/SConstruct aqsis-1.2.0/SConstruct |
3 | --- aqsis-1.2.0.orig/SConstruct 2007-02-18 23:25:17.000000000 +0100 | |
52d053fe | 4 | +++ aqsis-1.2.0/SConstruct 2007-03-17 13:02:30.847697500 +0100 |
5 | @@ -88,6 +88,9 @@ | |
6 | target_dir = env.Dir('#/build_debug') | |
7 | opts.Add('install_prefix', 'Root folder under which to install Aqsis', defout) | |
8 | opts.Add('build_prefix', 'Root folder under which to build Aqsis', target_dir) | |
9 | +opts.Add('pld_pluginsdir', 'Target directory for plugins') | |
10 | +opts.Add('pld_shadersdir', 'Target directory for shaders') | |
11 | +opts.Add('pld_configdir', 'Target directory for configuration file') | |
12 | ||
13 | # Make scons store build signatures in a single file _outside_ the install | |
14 | # hierarchy --- no more .sconsign files... | |
15 | @@ -197,7 +200,7 @@ | |
dbdc7c2a | 16 | # env.AppendUnique(CPPPATH = [env.subst(a)] ) |
17 | env.AppendUnique(CPPPATH = ['$boost_include_path']) | |
18 | ||
19 | -env.AppendUnique(CPPDEFINES=[('DEFAULT_PLUGIN_PATH', '\\"' + env.Dir('${PLUGINDIR}').abspath + '\\"')]) | |
52d053fe | 20 | +env.AppendUnique(CPPDEFINES=[('DEFAULT_PLUGIN_PATH', '\\"' + env.Dir('$pld_pluginsdir').abspath + '\\"')]) |
dbdc7c2a | 21 | |
22 | # | |
23 | # Enable MP dumping mode if specified | |
24 | diff -Nru aqsis-1.2.0.orig/platform/default/SConscript aqsis-1.2.0/platform/default/SConscript | |
25 | --- aqsis-1.2.0.orig/platform/default/SConscript 2007-02-04 11:44:55.000000000 +0100 | |
52d053fe | 26 | +++ aqsis-1.2.0/platform/default/SConscript 2007-03-17 13:02:52.097025500 +0100 |
dbdc7c2a | 27 | @@ -128,8 +128,8 @@ |
28 | ||
29 | # These absolute paths are necessary because there's no good general way of | |
30 | # getting a running program's install path on unix-like systems. | |
31 | -env.AppendUnique(CPPDEFINES=[('DEFAULT_RC_PATH', '\\"' + env.Dir('$SYSCONFDIR').abspath + '\\"')]) | |
32 | -env.AppendUnique(CPPDEFINES=[('DEFAULT_SHADER_PATH', '\\"' + env.Dir('$SHADERDIR').abspath + '\\"')]) | |
52d053fe | 33 | +env.AppendUnique(CPPDEFINES=[('DEFAULT_RC_PATH', '\\"' + env.Dir('$pld_configdir').abspath + '\\"')]) |
34 | +env.AppendUnique(CPPDEFINES=[('DEFAULT_SHADER_PATH', '\\"' + env.Dir('$pld_shadersdir').abspath +'\\"')]) | |
dbdc7c2a | 35 | env.Replace(SHLIB_VERSION_SUFFIX = '.%d.%d' %(version.major, version.minor)) |
36 | env.AppendUnique(SHLINKFLAGS=['-Wl,-soname=${TARGET.file}.%d' %version.major]) | |
37 |