==SCons==

+ Joseph Eagar provided a patch that re-enables the application icon for Blender. Hurray!
This commit is contained in:
Nathan Letwory 2006-03-10 20:47:34 +00:00
parent a71c07a044
commit 52dfa31cb8
5 changed files with 32 additions and 1 deletions

View File

@ -228,7 +228,7 @@ for tp in B.possible_types:
if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
B.propose_priorities()
dobj = B.buildinfo(env, "dynamic")
dobj = B.buildinfo(env, "dynamic") + B.resources
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)

View File

@ -6,3 +6,6 @@ SConscript(['blender/SConscript',
'creator/SConscript'])
if env['WITH_BF_GAMEENGINE'] == 1:
SConscript (['gameengine/SConscript'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
SConscript (['icons/SConscript'])

6
source/icons/SConscript Normal file
View File

@ -0,0 +1,6 @@
#!/usr/bin/python
Import ('env')
source = 'winblender_scons.rc'
env.BlenderRes('winresource', source, ['core', 'player'], priority=[95 , 100])

View File

@ -0,0 +1,2 @@
APPICON ICON "source\\icons\\winblender.ico"
BLENDERFILE ICON "source\\icons\\winblenderfile.ico"

View File

@ -39,6 +39,7 @@ quicklist = [] # The list of libraries/programs to compile during a quickie
program_list = [] # A list holding Nodes to final binaries, used to create installs
arguments = None
targets = None
resources = []
#some internals
blenderdeps = [] # don't manipulate this one outside this module!
@ -47,6 +48,10 @@ blenderdeps = [] # don't manipulate this one outside this module!
possible_types = ['core'] # can be set in ie. SConstruct
libs = {}
def getresources():
return resources
def init_lib_dict():
for pt in possible_types:
libs[pt] = {}
@ -317,6 +322,21 @@ def AppIt(target=None, source=None, env=None):
class BlenderEnvironment(SConsEnvironment):
def BlenderRes(self=None, libname=None, source=None, libtype=['core'], priority=[100]):
global libs
if not self or not libname or not source:
print bc.FAIL+'Cannot continue. Missing argument for BlenderRes '+libname+bc.ENDC
Exit()
if self['OURPLATFORM'] not in ('win32-vc','win32-mingw'):
print bc.FAIL+'BlenderRes is for windows only!'+bc.END
Exit()
print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
lenv = self.Copy()
res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
SConsEnvironment.Default(self, res)
resources.append(res)
def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None):
if not self or not libname or not sources: