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

proper memset test

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4800 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-10-30 20:50:30 +00:00
parent 4e84de07ca
commit 5db3e30206
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
SCons/Config/ms
View file

@ -136,10 +136,11 @@ def check_requirement(ctx, func, trigger):
flags = ctx.env['LINKFLAGS'] flags = ctx.env['LINKFLAGS']
ctx.env.Append(LINKFLAGS = '$NODEFLIBS_FLAG') ctx.env.Append(LINKFLAGS = '$NODEFLIBS_FLAG')
ctx.env.Append(LINKFLAGS = '${ENTRY_FLAG("main")}')
test = """ test = """
int __main() { int main() {
%s %s
return 0; return 0;
} }
@ -184,7 +185,7 @@ def add_file(file):
# a call to Int64ShrlMod32. # a call to Int64ShrlMod32.
# #
conf = stub_env.Configure(custom_tests = { 'CheckRequirement' : check_requirement }) conf = stub_env.Configure()
int64test = """ int64test = """
#include <windows.h> #include <windows.h>
@ -196,11 +197,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam,
if not conf.TryLink(int64test, '.c'): if not conf.TryLink(int64test, '.c'):
stub_env.Append(CPPDEFINES = ['_NSIS_NO_INT64_SHR']) stub_env.Append(CPPDEFINES = ['_NSIS_NO_INT64_SHR'])
conf.Finish()
# #
# MSVC 2005 requires the memset CRT function to be present # MSVC 2005 requires the memset CRT function to be present
# #
conf = defenv.Configure(custom_tests = { 'CheckRequirement' : check_requirement })
if conf.CheckRequirement('memset', 'char c[128] = "test";'): if conf.CheckRequirement('memset', 'char c[128] = "test";'):
add_file('memset.c') add_file('memset.c')