Port to VS 2008. Drop W9x support.
diff --git a/Tools/msi/msisupport.c b/Tools/msi/msisupport.c
index b293bfc..f60a356 100644
--- a/Tools/msi/msisupport.c
+++ b/Tools/msi/msisupport.c
@@ -1,8 +1,6 @@
#include "windows.h"
#include "msiquery.h"
-int isWinNT;
-
/* Print a debug message to the installer log file.
* To see the debug messages, install with
* msiexec /i pythonxy.msi /l*v python.log
@@ -30,21 +28,14 @@
DWORD size = PSIZE;
DWORD attributes;
- isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
- if (isWinNT)
- result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size);
- else
- result = MsiGetPropertyA(hInstall, "TARGETDIR", path, &size);
+ result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size);
if (result != ERROR_SUCCESS)
return result;
wpath[size] = L'\0';
path[size] = L'\0';
- if (isWinNT)
- attributes = GetFileAttributesW(wpath);
- else
- attributes = GetFileAttributesA(path);
+ attributes = GetFileAttributesW(wpath);
if (attributes == INVALID_FILE_ATTRIBUTES ||
!(attributes & FILE_ATTRIBUTE_DIRECTORY))
{
diff --git a/Tools/msi/msisupport.mak b/Tools/msi/msisupport.mak
index fb960c2..2905dbe 100644
--- a/Tools/msi/msisupport.mak
+++ b/Tools/msi/msisupport.mak
@@ -1,25 +1,9 @@
-!IF "$(CPU)" == ""
-# VS environment
-
# /OPT: REF and ICF are added by VS.NET by default
-# NOWIN98 saves 7k of executable size, at the expense of some
-# slowdown on Win98
msisupport.dll: msisupport.obj
- link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL /MACHINE:X86 /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /OPT:NOWIN98 msisupport.obj msi.lib kernel32.lib
+ link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF msisupport.obj msi.lib kernel32.lib
# We request a static CRT, so that there will be no CRT dependencies
# for the target system. We cannot do without a CRT, since it provides
# the DLL entry point.
msisupport.obj: msisupport.c
cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MT /W3 /c msisupport.c
-
-!ELSE
-# SDK environment: assume all options are already correct
-
-msisupport.dll: msisupport.obj
- link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL msisupport.obj msi.lib kernel32.lib
-
-msisupport.obj: msisupport.c
- cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MD /W3 /GS- /c msisupport.c
-!ENDIF
-