summary refs log tree commit diff stats
path: root/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props
blob: 41e4baaecd84a5e8647bf76b350a5da395171520 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
<!--
***********************************************************************************************
Microsoft.Cpp.Win32.v100.props

WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
          created a backup copy.  Incorrect changes to this file will make it
          impossible to load or build your projects from the command-line or the IDE.

Copyright (C) Microsoft Corporation. All rights reserved.
***********************************************************************************************
-->

<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore')" />

  <PropertyGroup>
    <PlatformToolsetVersion>100</PlatformToolsetVersion>

    <WDKInstallDir>$(SystemDrive)\WinDDK\7600.16385.1</WDKInstallDir>

    <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>
    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>

    <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir>
    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir>
    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir>
    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir>

    <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir>
    <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir>

    <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>
    <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>

    <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir>
    <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir>

    <FrameworkVersion Condition="'$(UseEnv)' != 'true'">v4.0</FrameworkVersion>
    <Framework35Version Condition="'$(UseEnv)' != 'true'">v3.5</Framework35Version>

    <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
    <IncludePath>$(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;</IncludePath>
    <LibraryPath>$(WDKInstallDir)\lib\wxp\i386;$(WDKInstallDir)\lib\Crt\i386;$(WDKInstallDir)\lib\Mfc\i386;$(WDKInstallDir)\lib\ATL\i386</LibraryPath>
    <SourcePath Condition="'$(SourcePath)' == ''">$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;</SourcePath>
    <NativeExecutablePath Condition="'$(NativeExecutablePath)' == ''">$(ExecutablePath)</NativeExecutablePath>
  </PropertyGroup>

  <ItemDefinitionGroup>
    <Link>
      <AdditionalDependencies>msvcrt_winxp.obj;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <ResourceCompile>
      <SuppressStartupBanner Condition="'%(ResourceCompile.SuppressStartupBanner)' == ''">true</SuppressStartupBanner>
    </ResourceCompile>
    <ManifestResourceCompile>
      <SuppressStartupBanner Condition="'%(ManifestResourceCompile.SuppressStartupBanner)'==''">true</SuppressStartupBanner>
    </ManifestResourceCompile>
    <Manifest>
      <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'static'">true</EnableDPIAwareness>
      <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'dynamic'">true</EnableDPIAwareness>
      <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' != 'static' AND '$(UseOfMFC)' != 'dynamic'">false</EnableDPIAwareness>
    </Manifest>
  </ItemDefinitionGroup>

  <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter')" />
</Project>
>+#ifndef stat +#define stat _stat +#endif +#ifndef getpid +#define getpid GetCurrentProcessId +#endif +#endif + #ifndef macintosh #include <sys/types.h> #endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/dbm/src/mktemp.c nss-3.12.7/mozilla/dbm/src/mktemp.c --- nss-3.12.7.orig/mozilla/dbm/src/mktemp.c 2009-06-05 01:19:30 +0200 +++ nss-3.12.7/mozilla/dbm/src/mktemp.c 2010-08-16 18:47:14 +0200 @@ -45,13 +45,13 @@ #include <ctype.h> #include "mcom_db.h" -#ifndef _WINDOWS -#include <unistd.h> -#endif - #ifdef _WINDOWS +#ifndef WINDDK_BUILD #include <process.h> +#endif #include "winfile.h" +#else +#include <unistd.h> #endif static int _gettemp(char *path, register int *doopen, int extraFlags); diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/config/config.mk nss-3.12.7/mozilla/nsprpub/config/config.mk --- nss-3.12.7.orig/mozilla/nsprpub/config/config.mk 2010-07-09 04:10:32 +0200 +++ nss-3.12.7/mozilla/nsprpub/config/config.mk 2010-08-16 18:47:14 +0200 @@ -154,6 +154,15 @@ DEFINES += -DMOZ_UNICODE endif +ifdef WINDDK_BUILD +OS_CFLAGS += -DWINDDK_BUILD +ifdef USE_64 +OS_LIBS += msvcrt_win2003.obj +else +OS_LIBS += msvcrt_winxp.obj +endif +endif + #################################################################### # # Configuration for the release process diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.7/mozilla/nsprpub/pr/src/Makefile.in --- nss-3.12.7.orig/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 09:06:06 +0100 +++ nss-3.12.7/mozilla/nsprpub/pr/src/Makefile.in 2010-08-16 18:47:14 +0200 @@ -197,9 +197,17 @@ ifdef NS_USE_GCC OS_LIBS = -ladvapi32 -lwsock32 -lwinmm else +ifdef WINDDK_BUILD +ifdef USE_64 +OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_win2003.obj +else +OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_winxp.obj +endif +else OS_LIBS = advapi32.lib wsock32.lib winmm.lib endif endif +endif ifeq ($(OS_ARCH),WINCE) OS_LIBS = ws2.lib diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.7/mozilla/nsprpub/pr/src/md/windows/ntmisc.c --- nss-3.12.7.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c 2009-08-27 01:27:44 +0200 +++ nss-3.12.7/mozilla/nsprpub/pr/src/md/windows/ntmisc.c 2010-08-16 18:47:14 +0200 @@ -624,7 +624,11 @@ */ hasFdInheritBuffer = (attr && attr->fdInheritBuffer); if ((envp == NULL) && hasFdInheritBuffer) { +#ifdef WINDDK_BUILD + envp = getenv; +#else envp = environ; +#endif } if (envp != NULL) { diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.7/mozilla/security/coreconf/WIN32.mk --- nss-3.12.7.orig/mozilla/security/coreconf/WIN32.mk 2010-06-24 01:28:52 +0200 +++ nss-3.12.7/mozilla/security/coreconf/WIN32.mk 2010-08-16 18:47:14 +0200 @@ -118,6 +118,14 @@ else # !NS_USE_GCC OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS + ifdef WINDDK_BUILD + OS_CFLAGS += -DWINDDK_BUILD + ifdef USE_64 + OS_LIBS += msvcrt_win2003.obj + else + OS_LIBS += msvcrt_winxp.obj + endif + endif ifeq ($(_MSC_VER),$(_MSC_VER_6)) ifndef MOZ_DEBUG_SYMBOLS OS_DLLFLAGS += -PDB:NONE diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/coreconf/arch.mk nss-3.12.7/mozilla/security/coreconf/arch.mk --- nss-3.12.7.orig/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:48 +0200 +++ nss-3.12.7/mozilla/security/coreconf/arch.mk 2010-08-16 18:47:14 +0200 @@ -268,7 +268,15 @@ # the uname.exe in the MSYS toolkit. # ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) - OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) + ifdef WINDDK_BUILD + ifdef USE_64 + OS_RELEASE := 5.2 + else + OS_RELEASE := 5.1 + endif + else + OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) + endif OS_ARCH = WINNT USE_MSYS = 1 ifndef CPU_ARCH diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.7/mozilla/security/nss/cmd/platlibs.mk --- nss-3.12.7.orig/mozilla/security/nss/cmd/platlibs.mk 2010-06-12 02:58:32 +0200 +++ nss-3.12.7/mozilla/security/nss/cmd/platlibs.mk 2010-08-16 18:47:14 +0200 @@ -249,3 +249,11 @@ endif JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) + +ifdef WINDDK_BUILD +ifdef USE_64 +OS_LIBS += msvcrt_win2003.obj +else +OS_LIBS += msvcrt_winxp.obj +endif +endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.7/mozilla/security/nss/cmd/selfserv/selfserv.c --- nss-3.12.7.orig/mozilla/security/nss/cmd/selfserv/selfserv.c 2010-04-03 20:27:26 +0200 +++ nss-3.12.7/mozilla/security/nss/cmd/selfserv/selfserv.c 2010-08-16 18:47:14 +0200 @@ -51,8 +51,13 @@ #endif #if defined(_WINDOWS) +#ifdef WINDDK_BUILD +#include <windows.h> +#define getpid GetCurrentProcessId +#else #include <process.h> /* for getpid() */ #endif +#endif #include <signal.h> #include <stdlib.h> diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.7/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c --- nss-3.12.7.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2009-03-10 21:18:06 +0100 +++ nss-3.12.7/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2010-08-16 18:47:14 +0200 @@ -80,7 +80,11 @@ #elif defined(_MSC_VER) +#ifdef WINDDK_BUILD +#include <ntddk.h> +#else #include <intrin.h> +#endif void freebl_cpuid(unsigned long op, unsigned long *eax, unsigned long *ebx, unsigned long *ecx, diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.7/mozilla/security/nss/lib/freebl/win_rand.c --- nss-3.12.7.orig/mozilla/security/nss/lib/freebl/win_rand.c 2009-07-15 05:34:04 +0200 +++ nss-3.12.7/mozilla/security/nss/lib/freebl/win_rand.c 2010-08-16 18:47:14 +0200 @@ -50,6 +50,13 @@ #include <sys/types.h> #include <sys/stat.h> #endif + +#ifdef WINDDK_BUILD +#ifndef stat +#define stat _stat +#endif +#endif + #include <stdio.h> #include "prio.h" #include "prerror.h" diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.7/mozilla/security/nss/lib/softoken/legacydb/config.mk --- nss-3.12.7.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk 2009-06-11 02:55:48 +0200 +++ nss-3.12.7/mozilla/security/nss/lib/softoken/legacydb/config.mk 2010-08-16 18:47:14 +0200 @@ -96,3 +96,11 @@ ifeq ($(OS_TARGET),WINCE) DEFINES += -DDBM_USING_NSPR endif + +ifdef WINDDK_BUILD +ifdef USE_64 +OS_LIBS += msvcrt_win2003.obj +else +OS_LIBS += msvcrt_winxp.obj +endif +endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.7/mozilla/security/nss/lib/sqlite/sqlite3.c --- nss-3.12.7.orig/mozilla/security/nss/lib/sqlite/sqlite3.c 2010-01-08 05:42:38 +0100 +++ nss-3.12.7/mozilla/security/nss/lib/sqlite/sqlite3.c 2010-08-16 18:47:14 +0200 @@ -10980,7 +10980,8 @@ ** localtime_s(). */ #if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S) && \ - defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) + defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) && \ + !defined(WINDDK_BUILD) #define HAVE_LOCALTIME_S 1 #endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.7/mozilla/security/nss/lib/ssl/sslimpl.h --- nss-3.12.7.orig/mozilla/security/nss/lib/ssl/sslimpl.h 2010-02-10 00:33:50 +0100 +++ nss-3.12.7/mozilla/security/nss/lib/ssl/sslimpl.h 2010-08-16 18:47:14 +0200 @@ -1621,8 +1621,13 @@ #elif defined(_WIN32_WCE) #define SSL_GETPID GetCurrentProcessId #elif defined(WIN32) +#ifdef WINDDK_BUILD +#include <windows.h> +#define SSL_GETPID GetCurrentProcessId +#else extern int __cdecl _getpid(void); #define SSL_GETPID _getpid +#endif #else #define SSL_GETPID() 0 #endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.7/mozilla/security/nss/lib/zlib/config.mk --- nss-3.12.7.orig/mozilla/security/nss/lib/zlib/config.mk 2009-11-07 01:13:10 +0100 +++ nss-3.12.7/mozilla/security/nss/lib/zlib/config.mk 2010-08-16 18:47:14 +0200 @@ -46,3 +46,11 @@ PROGRAM = EXTRA_LIBS = $(LIBRARY) + +ifdef WINDDK_BUILD +ifdef USE_64 +OS_LIBS += msvcrt_win2003.obj +else +OS_LIBS += msvcrt_winxp.obj +endif +endif diff -ruN --strip-trailing-cr nss-3.12.7.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.7/mozilla/security/nss/lib/zlib/gzio.c --- nss-3.12.7.orig/mozilla/security/nss/lib/zlib/gzio.c 2009-11-07 01:13:10 +0100 +++ nss-3.12.7/mozilla/security/nss/lib/zlib/gzio.c 2010-08-16 18:47:14 +0200 @@ -11,6 +11,12 @@ #include "zutil.h" +#ifdef WINDDK_BUILD +#ifndef vsnprintf +#define vsnprintf _vsnprintf +#endif +#endif + #ifdef NO_DEFLATE /* for compatibility with old definition */ # define NO_GZCOMPRESS #endif