svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928
[blender.git] / source / SConscript
index f5ace6e8be73ae1592748917d340f879fe7c85a4..d3a9373b4d8391820f11c2f6e77cccc59a2413ad 100644 (file)
@@ -1,8 +1,11 @@
 #!/usr/bin/python
-Import ('user_options_dict')
+Import ('env')
 
 SConscript(['blender/SConscript',
-            'kernel/SConscript',
-            'creator/SConscript'])
-if user_options_dict['BUILD_GAMEENGINE'] == 1:
-    SConscript (['gameengine/SConscript'])
+                       'kernel/SConscript',
+                       'creator/SConscript'])
+if env['WITH_BF_GAMEENGINE']:
+       SConscript (['gameengine/SConscript'])
+       
+if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw'):
+       SConscript (['icons/SConscript'])