[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32820] trunk/blender/intern/ghost: throw an error is PREFIX isnt defined on X11 systems.

Campbell Barton ideasman42 at gmail.com
Mon Nov 1 23:26:56 CET 2010


Revision: 32820
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32820
Author:   campbellbarton
Date:     2010-11-01 23:26:56 +0100 (Mon, 01 Nov 2010)

Log Message:
-----------
throw an error is PREFIX isnt defined on X11 systems. defaults to /usr/local

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2010-11-01 21:53:35 UTC (rev 32819)
+++ trunk/blender/intern/ghost/SConscript	2010-11-01 22:26:56 UTC (rev 32820)
@@ -21,6 +21,8 @@
             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:

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2010-11-01 21:53:35 UTC (rev 32819)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2010-11-01 22:26:56 UTC (rev 32820)
@@ -68,7 +68,7 @@
 #include <cstdlib> // for exit
 
 #ifndef PREFIX
-#  define PREFIX "/usr/local"
+#error "PREFIX not defined"
 #endif
 
 typedef struct NDOFPlatformInfo {





More information about the Bf-blender-cvs mailing list