[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12460] branches/pynodes: * disable blu for now, as it doesn't compile properly with GCC

[Nathan Letwory]

Revision: 12460
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12460
Author:   jesterking
Date:     2007-11-03 19:27:27 +0100 (Sat, 03 Nov 2007)

Log Message:
-----------
* disable blu for now, as it doesn't compile properly with GCC

Modified Paths:
--------------
    branches/pynodes/extern/SConscript
    branches/pynodes/source/blender/SConscript
    branches/pynodes/source/blender/src/header_text.c
    branches/pynodes/source/creator/creator.c

Modified: branches/pynodes/extern/SConscript
===================================================================
--- branches/pynodes/extern/SConscript	2007-11-03 18:17:22 UTC (rev 12459)
+++ branches/pynodes/extern/SConscript	2007-11-03 18:27:27 UTC (rev 12460)
@@ -14,7 +14,8 @@
 if env['WITH_BF_VERSE']:
     SConscript(['verse/dist/SConstruct'])
 
-SConscript(['lua/SConscript'])
+#if env['WITH_BF_BLU']:
+#    SConscript(['lua/SConscript'])
 
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['ffmpeg/SConscript']);

Modified: branches/pynodes/source/blender/SConscript
===================================================================
--- branches/pynodes/source/blender/SConscript	2007-11-03 18:17:22 UTC (rev 12459)
+++ branches/pynodes/source/blender/SConscript	2007-11-03 18:27:27 UTC (rev 12460)
@@ -9,7 +9,7 @@
             'blenpluginapi/SConscript',
             'imbuf/SConscript',
             'imbuf/intern/cineon/SConscript',
-            'blu/SConscript',
+#            'blu/SConscript',
             'makesdna/SConscript',
             'python/SConscript',
             'radiosity/SConscript',

Modified: branches/pynodes/source/blender/src/header_text.c
===================================================================
--- branches/pynodes/source/blender/src/header_text.c	2007-11-03 18:17:22 UTC (rev 12459)
+++ branches/pynodes/source/blender/src/header_text.c	2007-11-03 18:27:27 UTC (rev 12460)
@@ -69,6 +69,10 @@
 #include "BKE_depsgraph.h"
 #include "BSE_filesel.h"
 
+#ifdef USE_BLU
+#include "blu_interface.h"
+#endif
+
 #include "BPY_extern.h"
 #include "BPY_menus.h"
 
@@ -346,7 +350,9 @@
 	}
 	break;
 	case 8:
+#ifdef USE_BLU
 		blu_run_lua_script(st);
+#endif
 		break;
 	default:
 		break;
@@ -701,7 +707,9 @@
 		if (BPY_is_pyconstraint(text))
 			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Refresh All PyConstraints", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
 		
+#ifdef USE_BLU
 		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Run Lua Script", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
+#endif
 	}
 	
 	uiDefIconTextBlockBut(block, text_template_scriptsmenu, NULL, ICON_RIGHTARROW_THIN, "Script Templates", 0, yco-=20, 120, 19, "");

Modified: branches/pynodes/source/creator/creator.c
===================================================================
--- branches/pynodes/source/creator/creator.c	2007-11-03 18:17:22 UTC (rev 12459)
+++ branches/pynodes/source/creator/creator.c	2007-11-03 18:27:27 UTC (rev 12460)
@@ -97,7 +97,9 @@
 # include <sys/rtprio.h>
 #endif
 
+#ifdef USE_BLU
 #include "blu_interface.h"
+#endif
 
 // from buildinfo.c
 #ifdef BUILD_DATE
@@ -459,7 +461,9 @@
 		}
 
 		BPY_start_python(argc, argv);
+#ifdef USE_BLU
 		blu_start_lua(argc, argv);
+#endif
 		
 		/**
 		 * NOTE: sound_init_audio() *must be* after start_python,
@@ -472,7 +476,9 @@
 	}
 	else {
 		BPY_start_python(argc, argv);
+#ifdef USE_BLU
 		blu_start_lua(argc, argv);
+#endif
 		
 		// (ton) Commented out. I have no idea whats thisfor... will mail around!
 		// SYS_WriteCommandLineInt(syshandle,"noaudio",1);
@@ -707,9 +713,6 @@
 		set_scene(sce);
 	}
 	
-	blu_run_test(); /* replace with proper run script through GUI */
-
-	
 	BKE_write_undo("original");	/* save current state */
 	screenmain();