diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 01:26:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-02 01:26:56 +0300 |
commit | 7e913f25c26284fac862ddc5ff241afd40e938e4 (patch) | |
tree | 5e1b749218977e03d5ccee4a2ea919aecf31dd16 /intern | |
parent | 6ee21ceefb709fa877d85fabe5d3700edbbfbc84 (diff) |
throw an error is PREFIX isnt defined on X11 systems. defaults to /usr/local
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 25880e9679b..e6190c50577 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -21,6 +21,8 @@ if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'fr sources.remove('intern' + os.sep + f + 'Carbon.cpp') except ValueError: pass + defs += ['PREFIX=\\"/usr/local/\\"'] + elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): for f in pf: try: diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 393761566ba..5f7c59fa5e6 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -68,7 +68,7 @@ #include <cstdlib> // for exit #ifndef PREFIX -# define PREFIX "/usr/local" +#error "PREFIX not defined" #endif typedef struct NDOFPlatformInfo { |