diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-22 02:36:22 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-08-22 02:36:22 (GMT) |
| commit | 7c38a1132cebac8b5831f4eeb949fa6c179eb314 (patch) | |
| tree | 9bd631bb7369b209f54587f46e726180eebeab2c | |
| parent | d7683b28d39cdb741f999fa2fb9c1ea34719a542 (diff) | |
| download | SCons-7c38a1132cebac8b5831f4eeb949fa6c179eb314.zip SCons-7c38a1132cebac8b5831f4eeb949fa6c179eb314.tar.gz SCons-7c38a1132cebac8b5831f4eeb949fa6c179eb314.tar.bz2 | |
Fixed some test rot in test/IDL/midl.py, so it works on Win7.
| -rw-r--r-- | test/IDL/midl.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/test/IDL/midl.py b/test/IDL/midl.py index 08b604e..f5c864f 100644 --- a/test/IDL/midl.py +++ b/test/IDL/midl.py @@ -61,6 +61,7 @@ local = env.Clone(WINDOWS_INSERT_DEF = 1) barsrc = [ 'BarObject.cpp', + 'BarPCH.obj', 'bar.cpp', local.RES('bar.rc', RCFLAGS= '/I${SOURCE.srcdir}'), ] @@ -71,7 +72,7 @@ local.SharedLibrary(target = 'bar.dll', source = barsrc, PCH=local.PCH('BarPCH.cpp', CXXFLAGS='/nologo')[0], PCHSTOP = 'BarPCH.h', - register=1) + register=0) # can't test registration, Win7 requires elevation for that. """) test.write('src/BarObject.cpp',''' @@ -143,12 +144,12 @@ HKCR test.write('src/BarPCH.cpp',''' #include "BarPCH.h" -#ifdef _ATL_STATIC_REGISTRY -#include <statreg.h> -#include <statreg.cpp> -#endif +// #ifdef _ATL_STATIC_REGISTRY +// #include <statreg.h> +// #include <statreg.cpp> +// #endif -#include <atlimpl.cpp> +// #include <atlimpl.cpp> ''') test.write('src/BarPCH.h',''' @@ -161,7 +162,7 @@ test.write('src/BarPCH.h',''' #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0501 #endif #define _ATL_APARTMENT_THREADED @@ -228,10 +229,10 @@ test.write('src/bar.def',''' LIBRARY "bar.DLL" EXPORTS - DllCanUnloadNow @1 PRIVATE - DllGetClassObject @2 PRIVATE - DllRegisterServer @3 PRIVATE - DllUnregisterServer @4 PRIVATE + DllCanUnloadNow PRIVATE + DllGetClassObject PRIVATE + DllRegisterServer PRIVATE + DllUnregisterServer PRIVATE ''') test.write('src/bar.idl',''' |