dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added support for compilation of cross platform utilities

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4272 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-09-17 09:43:10 +00:00
parent 4bf6509225
commit 08665528b9
4 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SCons/Config/default
View file

@ -28,6 +28,10 @@ plugin_env = defenv.Copy(no_import_lib = 1)
util_env = defenv.Copy() util_env = defenv.Copy()
### cross-platform util environment
cp_util_env = util_env.Copy()
# return # return
Return('stub_env makensis_env plugin_env util_env') Return('stub_env makensis_env plugin_env util_env cp_util_env')

22
SCons/Config/gnu
View file

@ -70,19 +70,23 @@ plugin_env.Append(LINKFLAGS = '-mwindows') # build windows executables
plugin_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align plugin_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file plugin_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### cross-platform util environment
cp_util_env = defenv.Copy()
cp_util_env.Append(CCFLAGS = '-O2') # optimize
cp_util_env.Append(CCFLAGS = '-Wall') # all warnings
cp_util_env.Append(LINKFLAGS = '-s') # strip
cp_util_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
cp_util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### util environment ### util environment
util_env = defenv.Copy() util_env = cp_util_env.Copy()
cross_env(util_env) cross_env(util_env)
util_env.Append(CCFLAGS = '-O2') # optimize
util_env.Append(CCFLAGS = '-Wall') # all warnings
util_env.Append(LINKFLAGS = '-s') # strip
util_env.Append(LINKFLAGS = '-mwindows') # build windows executables util_env.Append(LINKFLAGS = '-mwindows') # build windows executables
util_env.Append(LINKFLAGS = '$ALIGN_FLAG') # 512 bytes align
util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### weird GCC requirements ### weird GCC requirements
@ -164,4 +168,4 @@ conf.Finish()
### return ### return
Return('stub_env makensis_env plugin_env util_env') Return('stub_env makensis_env plugin_env util_env cp_util_env')

6
SCons/Config/ms
View file

@ -66,6 +66,10 @@ util_env.Append(CCFLAGS = '/W3') # level 3 warnings
util_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align util_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align
util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file util_env.Append(LINKFLAGS = '$MAP_FLAG') # generate map file
### cross-platform util environment
cp_util_env = util_env.Copy()
# return # return
Return('stub_env makensis_env plugin_env util_env') Return('stub_env makensis_env plugin_env util_env cp_util_env')

8
SConstruct
View file

@ -185,6 +185,7 @@ stub_env = envs[0]
makensis_env = envs[1] makensis_env = envs[1]
plugin_env = envs[2] plugin_env = envs[2]
util_env = envs[3] util_env = envs[3]
cp_util_env = envs[4]
###################################################################### ######################################################################
####### Aliases ### ####### Aliases ###
@ -365,8 +366,11 @@ for plugin in plugins:
def BuildUtil(target, source, libs, entry = None, res = None, def BuildUtil(target, source, libs, entry = None, res = None,
resources = None, defines = None, flags = None, resources = None, defines = None, flags = None,
nodeflib = False, install = None, install_as = None, nodeflib = False, install = None, install_as = None,
examples = None, docs = None): examples = None, docs = None, cross_platform = False):
env = util_env.Copy() if not cross_platform:
env = util_env.Copy()
else:
env = cp_util_env.Copy()
AddEnvStandardFlags(env, defines, flags, entry, nodeflib) AddEnvStandardFlags(env, defines, flags, entry, nodeflib)