From b97b65360984b8769ea266b5412ee6ca789f71ce Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 29 May 2011 14:24:16 +0000 Subject: mSVC: fixed test problem in test/MSVC/embed-manifest.py by ensuring a manifest gets generated -- added /MANIFEST to LINKFLAGS and SHLINKFLAGS. --- test/MSVC/embed-manifest.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/MSVC/embed-manifest.py b/test/MSVC/embed-manifest.py index 9fd4460..92f36a2 100644 --- a/test/MSVC/embed-manifest.py +++ b/test/MSVC/embed-manifest.py @@ -45,6 +45,8 @@ if sys.platform != 'win32': test.write('SConstruct', """\ env=Environment(WINDOWS_EMBED_MANIFEST=True) env.Append(CCFLAGS = '/MD') +env.Append(LINKFLAGS = '/MANIFEST') +env.Append(SHLINKFLAGS = '/MANIFEST') exe=env.Program('test.cpp') dll=env.SharedLibrary('testdll.cpp') env.Command('exe-extracted.manifest', exe, @@ -69,15 +71,12 @@ main(int argc, char *argv) test.write('testdll.cpp', """\ #include #include -int i; -int + +__declspec(dllexport) int testdll(int argc, char *argv) { printf("testdll.cpp\\n"); - if (0) - exit (0); - else - return 0; + return 0; } """) -- cgit v0.12