ChangeLogTag:Fri Sep 10 16:38:51 1999 Nanbor Wang <nanbor@cs.wustl.edu>

38 files changed, 2815 insertions, 2012 deletions

diff --git a/tests/WinCE/Atomic_Op_Test.dsp b/tests/WinCE/Atomic_Op_Test.dsp
index 661d483cb7f..f5075691995 100644
--- a/tests/WinCE/Atomic_Op_Test.dsp
+++ b/tests/WinCE/Atomic_Op_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Atomic_Op_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Atomic_Op_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Atomic_Op_Test.mak"\

- CFG="Atomic_Op_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Atomic_Op_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Atomic_Op_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Atomic_Op_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Atomic_Op_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Atomic_Op_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Atomic_Op_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Atomic_Op_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Atomic_Op_Test - Win32 (WCE x86em) Debug"

 # Name "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

-# Name "Atomic_Op_Test - Win32 (WCE SH) Debug"

+# Name "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ATOMI=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Barrier_Test.dsp b/tests/WinCE/Barrier_Test.dsp
index ee1a16ae6ba..913c704ee42 100644
--- a/tests/WinCE/Barrier_Test.dsp
+++ b/tests/WinCE/Barrier_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Barrier_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Barrier_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Barrier_Test.mak"\

- CFG="Barrier_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Barrier_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Barrier_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Barrier_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Barrier_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Barrier_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Barrier_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Barrier_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Barrier_Test - Win32 (WCE x86em) Debug"

 # Name "Barrier_Test - Win32 (WCE MIPS) Debug"

-# Name "Barrier_Test - Win32 (WCE SH) Debug"

+# Name "Barrier_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,7 +420,6 @@ DEP_CPP_BARRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -426,6 +428,9 @@ DEP_CPP_BARRI=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

@@ -486,7 +491,6 @@ DEP_CPP_BARRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -495,8 +499,11 @@ DEP_CPP_BARRI=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_BARRI=\

 	"..\..\ace\ACE.h"\

@@ -555,7 +562,6 @@ DEP_CPP_BARRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -564,6 +570,9 @@ DEP_CPP_BARRI=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -584,7 +593,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -656,7 +665,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -666,6 +674,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

@@ -726,7 +737,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -736,8 +746,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -796,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -806,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -818,7 +833,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -888,7 +903,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -899,6 +913,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

 

@@ -961,7 +978,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -972,8 +988,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1034,7 +1053,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1045,6 +1063,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Basic_Types_Test.dsp b/tests/WinCE/Basic_Types_Test.dsp
index dd46b1d5b6d..cfe3ba19a4a 100644
--- a/tests/WinCE/Basic_Types_Test.dsp
+++ b/tests/WinCE/Basic_Types_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Basic_Types_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Basic_Types_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Basic_Types_Test.mak"\

- CFG="Basic_Types_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Basic_Types_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Basic_Types_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Basic_Types_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Basic_Types_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Basic_Types_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Basic_Types_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Basic_Types_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Basic_Types_Test - Win32 (WCE x86em) Debug"

 # Name "Basic_Types_Test - Win32 (WCE MIPS) Debug"

-# Name "Basic_Types_Test - Win32 (WCE SH) Debug"

+# Name "Basic_Types_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_BASIC=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_BASIC=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_BASIC=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_BASIC=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Buffer_Stream_Test.dsp b/tests/WinCE/Buffer_Stream_Test.dsp
index 883093a1e3f..b5c216bd135 100644
--- a/tests/WinCE/Buffer_Stream_Test.dsp
+++ b/tests/WinCE/Buffer_Stream_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Buffer_Stream_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Buffer_Stream_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Buffer_Stream_Test.mak"\

- CFG="Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Buffer_Stream_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Buffer_Stream_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Buffer_Stream_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Buffer_Stream_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

 # Name "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

-# Name "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+# Name "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -457,7 +460,6 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -478,6 +480,9 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

@@ -578,7 +583,6 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -599,8 +603,11 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_BUFFE=\

 	"..\..\ace\ACE.h"\

@@ -699,7 +706,6 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -720,6 +726,9 @@ DEP_CPP_BUFFE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -740,7 +749,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -812,7 +821,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -822,6 +830,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

@@ -882,7 +893,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -892,8 +902,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -952,7 +965,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -962,6 +974,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -974,7 +989,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1044,7 +1059,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1055,6 +1069,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

 

@@ -1117,7 +1134,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1128,8 +1144,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1190,7 +1209,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1201,6 +1219,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Conn_Test.dsp b/tests/WinCE/Conn_Test.dsp
index 4f197947b3f..c29d1050e60 100644
--- a/tests/WinCE/Conn_Test.dsp
+++ b/tests/WinCE/Conn_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Conn_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,18 +19,16 @@ CFG=Conn_Test - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Conn_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Conn_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Conn_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Conn_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Conn_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Conn_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

 

@@ -45,6 +43,9 @@ CFG=Conn_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -53,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

@@ -78,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -113,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -141,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Conn_Test - Win32 (WCE x86em) Debug"

 # Name "Conn_Test - Win32 (WCE MIPS) Debug"

-# Name "Conn_Test - Win32 (WCE SH) Debug"

+# Name "Conn_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -205,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -213,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

@@ -273,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -281,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -341,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -349,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -490,7 +494,6 @@ DEP_CPP_CONN_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -512,6 +515,9 @@ DEP_CPP_CONN_=\
 	"..\Conn_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

@@ -646,7 +652,6 @@ DEP_CPP_CONN_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -668,8 +673,11 @@ DEP_CPP_CONN_=\
 	"..\Conn_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_CONN_=\

 	"..\..\ace\Acceptor.cpp"\

@@ -802,7 +810,6 @@ DEP_CPP_CONN_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -824,6 +831,9 @@ DEP_CPP_CONN_=\
 	"..\Conn_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -844,7 +854,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -916,7 +926,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -926,6 +935,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

@@ -986,7 +998,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -996,8 +1007,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -1056,7 +1070,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1066,6 +1079,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -1078,7 +1094,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1148,7 +1164,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1159,6 +1174,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

 

@@ -1221,7 +1239,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1232,8 +1249,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1294,7 +1314,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1305,6 +1324,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Enum_Interfaces_Test.dsp b/tests/WinCE/Enum_Interfaces_Test.dsp
index c3c03dbc08f..15ca675839c 100644
--- a/tests/WinCE/Enum_Interfaces_Test.dsp
+++ b/tests/WinCE/Enum_Interfaces_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Enum_Interfaces_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Enum_Interfaces_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak"\

- CFG="Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Enum_Interfaces_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Enum_Interfaces_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

 # Name "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

-# Name "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+# Name "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -421,13 +424,15 @@ DEP_CPP_ENUM_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

@@ -492,15 +497,17 @@ DEP_CPP_ENUM_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ENUM_=\

 	"..\..\ace\ACE.h"\

@@ -563,13 +570,15 @@ DEP_CPP_ENUM_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -590,7 +599,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -662,7 +671,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -672,6 +680,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

@@ -732,7 +743,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -742,8 +752,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -802,7 +815,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -812,6 +824,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -824,7 +839,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -894,7 +909,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -905,6 +919,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

 

@@ -967,7 +984,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -978,8 +994,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1040,7 +1059,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1051,6 +1069,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Future_Test.dsp b/tests/WinCE/Future_Test.dsp
index 8866e1a59b4..b2103db2dbc 100644
--- a/tests/WinCE/Future_Test.dsp
+++ b/tests/WinCE/Future_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Future_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,18 +19,16 @@ CFG=Future_Test - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Future_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Future_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Future_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Future_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Future_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Future_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

 

@@ -45,6 +43,9 @@ CFG=Future_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -53,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

@@ -78,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -113,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -141,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Future_Test - Win32 (WCE x86em) Debug"

 # Name "Future_Test - Win32 (WCE MIPS) Debug"

-# Name "Future_Test - Win32 (WCE SH) Debug"

+# Name "Future_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -205,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -213,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

@@ -273,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -281,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -341,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -349,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -458,7 +462,6 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -478,6 +481,9 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

@@ -580,7 +586,6 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -600,8 +605,11 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_FUTUR=\

 	"..\..\ace\ACE.h"\

@@ -702,7 +710,6 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -722,6 +729,9 @@ DEP_CPP_FUTUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -742,7 +752,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -814,7 +824,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -824,6 +833,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

@@ -884,7 +896,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -894,8 +905,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -954,7 +968,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -964,6 +977,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -976,7 +992,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1046,7 +1062,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1057,6 +1072,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

 

@@ -1119,7 +1137,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1130,8 +1147,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1192,7 +1212,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1203,6 +1222,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Handle_Set_Test.dsp b/tests/WinCE/Handle_Set_Test.dsp
index 2c19f36606d..daecf0c9d83 100644
--- a/tests/WinCE/Handle_Set_Test.dsp
+++ b/tests/WinCE/Handle_Set_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Handle_Set_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Handle_Set_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Handle_Set_Test.mak"\

- CFG="Handle_Set_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Handle_Set_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Handle_Set_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Handle_Set_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Handle_Set_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Handle_Set_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Handle_Set_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Handle_Set_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Handle_Set_Test - Win32 (WCE x86em) Debug"

 # Name "Handle_Set_Test - Win32 (WCE MIPS) Debug"

-# Name "Handle_Set_Test - Win32 (WCE SH) Debug"

+# Name "Handle_Set_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -423,7 +426,6 @@ DEP_CPP_HANDL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -431,6 +433,9 @@ DEP_CPP_HANDL=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

@@ -497,7 +502,6 @@ DEP_CPP_HANDL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -505,8 +509,11 @@ DEP_CPP_HANDL=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_HANDL=\

 	"..\..\ace\ACE.h"\

@@ -571,7 +578,6 @@ DEP_CPP_HANDL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -579,6 +585,9 @@ DEP_CPP_HANDL=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -599,7 +608,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -671,7 +680,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -681,6 +689,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

@@ -741,7 +752,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -751,8 +761,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -811,7 +824,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -821,6 +833,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -833,7 +848,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -903,7 +918,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -914,6 +928,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

 

@@ -976,7 +993,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -987,8 +1003,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1049,7 +1068,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1060,6 +1078,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Hash_Map_Manager_Test.dsp b/tests/WinCE/Hash_Map_Manager_Test.dsp
index 5f5fffdb153..80f8e2d5b7c 100644
--- a/tests/WinCE/Hash_Map_Manager_Test.dsp
+++ b/tests/WinCE/Hash_Map_Manager_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Hash_Map_Manager_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Hash_Map_Manager_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak"\

- CFG="Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Hash_Map_Manager_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

 # Name "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

-# Name "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+# Name "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -431,7 +434,6 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -440,9 +442,12 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

-	"..\Hash_Map_Manager_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -517,7 +522,6 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -526,11 +530,14 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

-	"..\Hash_Map_Manager_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_HASH_=\

 	"..\..\ace\ACE.h"\

@@ -603,7 +610,6 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -612,9 +618,12 @@ DEP_CPP_HASH_=\
 	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

-	"..\Hash_Map_Manager_Test.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

 

 !ENDIF 

 

@@ -635,7 +644,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -707,7 +716,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -717,6 +725,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -777,7 +788,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -787,8 +797,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -847,7 +860,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -857,6 +869,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -869,7 +884,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -939,7 +954,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -950,6 +964,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -1012,7 +1029,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1023,8 +1039,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1085,7 +1104,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1096,6 +1114,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/MT_SOCK_Test.dsp b/tests/WinCE/MT_SOCK_Test.dsp
index 8e4b891cea1..12918acb791 100644
--- a/tests/WinCE/MT_SOCK_Test.dsp
+++ b/tests/WinCE/MT_SOCK_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=MT_SOCK_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=MT_SOCK_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "MT_SOCK_Test.mak"\

- CFG="MT_SOCK_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_SOCK_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "MT_SOCK_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "MT_SOCK_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "MT_SOCK_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "MT_SOCK_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "MT_SOCK_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=MT_SOCK_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "MT_SOCK_Test - Win32 (WCE x86em) Debug"

 # Name "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

-# Name "MT_SOCK_Test - Win32 (WCE SH) Debug"

+# Name "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -435,7 +438,6 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -445,6 +447,9 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -523,7 +528,6 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -533,8 +537,11 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MT_SO=\

 	"..\..\ace\ACE.h"\

@@ -611,7 +618,6 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -621,6 +627,9 @@ DEP_CPP_MT_SO=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -641,7 +650,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -713,7 +722,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -723,6 +731,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -783,7 +794,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -793,8 +803,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -853,7 +866,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -863,6 +875,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -875,7 +890,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -945,7 +960,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -956,6 +970,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -1018,7 +1035,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1029,8 +1045,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1091,7 +1110,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1102,6 +1120,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Map_Manager_Test.dsp b/tests/WinCE/Map_Manager_Test.dsp
index 7378ac5ba2d..53600b2ecfc 100644
--- a/tests/WinCE/Map_Manager_Test.dsp
+++ b/tests/WinCE/Map_Manager_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Map_Manager_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Map_Manager_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Map_Manager_Test.mak"\

- CFG="Map_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Map_Manager_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Map_Manager_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Map_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Map_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Map_Manager_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Map_Manager_Test - Win32 (WCE x86em) Debug"

 # Name "Map_Manager_Test - Win32 (WCE MIPS) Debug"

-# Name "Map_Manager_Test - Win32 (WCE SH) Debug"

+# Name "Map_Manager_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -438,7 +441,6 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -450,6 +452,9 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -531,7 +536,6 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -543,8 +547,11 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MAP_M=\

 	"..\..\ace\ACE.h"\

@@ -624,7 +631,6 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -636,6 +642,9 @@ DEP_CPP_MAP_M=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -656,7 +665,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -728,7 +737,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -738,6 +746,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -798,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -808,8 +818,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -868,7 +881,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -878,6 +890,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -890,7 +905,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -960,7 +975,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -971,6 +985,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -1033,7 +1050,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1044,8 +1060,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1106,7 +1125,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1117,6 +1135,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Mem_Map_Test.dsp b/tests/WinCE/Mem_Map_Test.dsp
index fb532606c82..fae67ef6789 100644
--- a/tests/WinCE/Mem_Map_Test.dsp
+++ b/tests/WinCE/Mem_Map_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Mem_Map_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Mem_Map_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Mem_Map_Test.mak"\

- CFG="Mem_Map_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Mem_Map_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Mem_Map_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Mem_Map_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Mem_Map_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Mem_Map_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Mem_Map_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Mem_Map_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Mem_Map_Test - Win32 (WCE x86em) Debug"

 # Name "Mem_Map_Test - Win32 (WCE MIPS) Debug"

-# Name "Mem_Map_Test - Win32 (WCE SH) Debug"

+# Name "Mem_Map_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_MEM_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_MEM_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MEM_M=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_MEM_M=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Message_Block_Test.dsp b/tests/WinCE/Message_Block_Test.dsp
index 97e38aada19..54a09c41a12 100644
--- a/tests/WinCE/Message_Block_Test.dsp
+++ b/tests/WinCE/Message_Block_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Message_Block_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Message_Block_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Block_Test.mak"\

- CFG="Message_Block_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Block_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Message_Block_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Message_Block_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Message_Block_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Block_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Block_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Message_Block_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Message_Block_Test - Win32 (WCE x86em) Debug"

 # Name "Message_Block_Test - Win32 (WCE MIPS) Debug"

-# Name "Message_Block_Test - Win32 (WCE SH) Debug"

+# Name "Message_Block_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -458,7 +461,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -479,6 +481,9 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -580,7 +585,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -601,8 +605,11 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

@@ -702,7 +709,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -723,6 +729,9 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -743,7 +752,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -815,7 +824,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -825,6 +833,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -885,7 +896,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -895,8 +905,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -955,7 +968,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -965,6 +977,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -977,7 +992,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1047,7 +1062,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1058,6 +1072,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -1120,7 +1137,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1131,8 +1147,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1193,7 +1212,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1204,6 +1222,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Message_Queue_Notifications_Test.dsp b/tests/WinCE/Message_Queue_Notifications_Test.dsp
index 4ad95f20660..cfec1646807 100644
--- a/tests/WinCE/Message_Queue_Notifications_Test.dsp
+++ b/tests/WinCE/Message_Queue_Notifications_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak"\

- CFG="Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

 # Name "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

-# Name "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+# Name "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -360,7 +363,7 @@ SOURCE=..\Message_Queue_Notifications_Test.cpp
 

 !IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -417,17 +420,19 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -484,17 +489,19 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -551,13 +558,15 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Message_Queue_Test.dsp b/tests/WinCE/Message_Queue_Test.dsp
index 08c198d025d..9cea8d9574a 100644
--- a/tests/WinCE/Message_Queue_Test.dsp
+++ b/tests/WinCE/Message_Queue_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Message_Queue_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Message_Queue_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Test.mak"\

- CFG="Message_Queue_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Message_Queue_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Message_Queue_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Message_Queue_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Queue_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Queue_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Message_Queue_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Message_Queue_Test - Win32 (WCE x86em) Debug"

 # Name "Message_Queue_Test - Win32 (WCE MIPS) Debug"

-# Name "Message_Queue_Test - Win32 (WCE SH) Debug"

+# Name "Message_Queue_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -448,7 +451,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -463,6 +465,9 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -554,7 +559,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -569,8 +573,11 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

@@ -660,7 +667,6 @@ DEP_CPP_MESSA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -675,6 +681,9 @@ DEP_CPP_MESSA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -695,7 +704,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -767,7 +776,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -777,6 +785,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -837,7 +848,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -847,8 +857,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -907,7 +920,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -917,6 +929,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -929,7 +944,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -999,7 +1014,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1010,6 +1024,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -1072,7 +1089,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1083,8 +1099,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1145,7 +1164,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1156,6 +1174,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Notify_Performance_Test.dsp b/tests/WinCE/Notify_Performance_Test.dsp
index ca3b16a374b..bd67364c679 100644
--- a/tests/WinCE/Notify_Performance_Test.dsp
+++ b/tests/WinCE/Notify_Performance_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Notify_Performance_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Notify_Performance_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Notify_Performance_Test.mak"\

- CFG="Notify_Performance_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Notify_Performance_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Notify_Performance_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Notify_Performance_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Notify_Performance_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Notify_Performance_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Notify_Performance_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Notify_Performance_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Notify_Performance_Test - Win32 (WCE x86em) Debug"

 # Name "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

-# Name "Notify_Performance_Test - Win32 (WCE SH) Debug"

+# Name "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -463,7 +466,6 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -481,6 +483,9 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -587,7 +592,6 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -605,8 +609,11 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_NOTIF=\

 	"..\..\ace\ACE.h"\

@@ -711,7 +718,6 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -729,6 +735,9 @@ DEP_CPP_NOTIF=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -749,7 +758,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -821,7 +830,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -831,6 +839,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -891,7 +902,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -901,8 +911,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -961,7 +974,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -971,6 +983,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -983,7 +998,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1053,7 +1068,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1064,6 +1078,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -1126,7 +1143,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1137,8 +1153,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1199,7 +1218,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1210,6 +1228,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/OrdMultiSet_Test.dsp b/tests/WinCE/OrdMultiSet_Test.dsp
index 30d93bbacb7..44787688012 100644
--- a/tests/WinCE/OrdMultiSet_Test.dsp
+++ b/tests/WinCE/OrdMultiSet_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=OrdMultiSet_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=OrdMultiSet_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "OrdMultiSet_Test.mak"\

- CFG="OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "OrdMultiSet_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "OrdMultiSet_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "OrdMultiSet_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=OrdMultiSet_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

 # Name "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

-# Name "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+# Name "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_ORDMU=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_ORDMU=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ORDMU=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_ORDMU=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Priority_Buffer_Test.dsp b/tests/WinCE/Priority_Buffer_Test.dsp
index e5ebf6a9cbf..2a8c0df98e0 100644
--- a/tests/WinCE/Priority_Buffer_Test.dsp
+++ b/tests/WinCE/Priority_Buffer_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Priority_Buffer_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Priority_Buffer_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Priority_Buffer_Test.mak"\

- CFG="Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Buffer_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Priority_Buffer_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Priority_Buffer_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Priority_Buffer_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

 # Name "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

-# Name "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+# Name "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -448,7 +451,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -463,6 +465,9 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

@@ -554,7 +559,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -569,8 +573,11 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PRIOR=\

 	"..\..\ace\ACE.h"\

@@ -660,7 +667,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -675,6 +681,9 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -695,7 +704,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -767,7 +776,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -777,6 +785,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

@@ -837,7 +848,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -847,8 +857,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -907,7 +920,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -917,6 +929,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -929,7 +944,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -999,7 +1014,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1010,6 +1024,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

 

@@ -1072,7 +1089,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1083,8 +1099,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1145,7 +1164,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1156,6 +1174,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Priority_Task_Test.dsp b/tests/WinCE/Priority_Task_Test.dsp
index 7516da802ab..93699bd75cd 100644
--- a/tests/WinCE/Priority_Task_Test.dsp
+++ b/tests/WinCE/Priority_Task_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Priority_Task_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Priority_Task_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Priority_Task_Test.mak"\

- CFG="Priority_Task_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Task_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Priority_Task_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Priority_Task_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Priority_Task_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Priority_Task_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Priority_Task_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Priority_Task_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Priority_Task_Test - Win32 (WCE x86em) Debug"

 # Name "Priority_Task_Test - Win32 (WCE MIPS) Debug"

-# Name "Priority_Task_Test - Win32 (WCE SH) Debug"

+# Name "Priority_Task_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -456,7 +459,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -476,6 +478,9 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -575,7 +580,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -595,8 +599,11 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PRIOR=\

 	"..\..\ace\ACE.h"\

@@ -694,7 +701,6 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -714,6 +720,9 @@ DEP_CPP_PRIOR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -734,7 +743,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -806,7 +815,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -816,6 +824,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -876,7 +887,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -886,8 +896,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -946,7 +959,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -956,6 +968,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -968,7 +983,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1038,7 +1053,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1049,6 +1063,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -1111,7 +1128,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1122,8 +1138,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1184,7 +1203,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1195,6 +1213,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Reactor_Notify_Test.dsp b/tests/WinCE/Reactor_Notify_Test.dsp
index 0a80c9a3b54..d722ed70d75 100644
--- a/tests/WinCE/Reactor_Notify_Test.dsp
+++ b/tests/WinCE/Reactor_Notify_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Reactor_Notify_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Reactor_Notify_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Notify_Test.mak"\

- CFG="Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Notify_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Reactor_Notify_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Reactor_Notify_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Reactor_Notify_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

 # Name "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

-# Name "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+# Name "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -463,7 +466,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -485,6 +487,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

@@ -591,7 +596,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -613,8 +617,11 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

@@ -719,7 +726,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -741,6 +747,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -761,7 +770,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -833,7 +842,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -843,6 +851,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

@@ -903,7 +914,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -913,8 +923,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -973,7 +986,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -983,6 +995,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -995,7 +1010,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1065,7 +1080,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1076,6 +1090,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

 

@@ -1138,7 +1155,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1149,8 +1165,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1211,7 +1230,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1222,6 +1240,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Reactor_Performance_Test.dsp b/tests/WinCE/Reactor_Performance_Test.dsp
index dd83d4b2a74..719072a9d98 100644
--- a/tests/WinCE/Reactor_Performance_Test.dsp
+++ b/tests/WinCE/Reactor_Performance_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Reactor_Performance_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Reactor_Performance_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Performance_Test.mak"\

- CFG="Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Performance_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Reactor_Performance_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Reactor_Performance_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Reactor_Performance_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

 # Name "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

-# Name "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+# Name "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -360,7 +363,7 @@ SOURCE=..\Reactor_Performance_Test.cpp
 

 !IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -417,17 +420,19 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -484,17 +489,19 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -551,13 +558,15 @@ DEP_CPP_ATOMI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Reactor_Timer_Test.dsp b/tests/WinCE/Reactor_Timer_Test.dsp
index 99d9451b892..be3b028e5d2 100644
--- a/tests/WinCE/Reactor_Timer_Test.dsp
+++ b/tests/WinCE/Reactor_Timer_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Reactor_Timer_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Reactor_Timer_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactor_Timer_Test.mak"\

- CFG="Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Timer_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Reactor_Timer_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Reactor_Timer_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Reactor_Timer_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

 # Name "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

-# Name "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+# Name "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -422,7 +425,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -433,6 +435,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

@@ -498,7 +503,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -509,8 +513,11 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

@@ -574,7 +581,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Timer_Queue.h"\

@@ -585,6 +591,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -605,7 +614,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -677,7 +686,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -687,6 +695,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

@@ -747,7 +758,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -757,8 +767,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -817,7 +830,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -827,6 +839,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -839,7 +854,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -909,7 +924,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -920,6 +934,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

 

@@ -982,7 +999,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -993,8 +1009,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1055,7 +1074,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1066,6 +1084,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Reactors_Test.dsp b/tests/WinCE/Reactors_Test.dsp
index 3bd8ebe6788..392c2f50fd3 100644
--- a/tests/WinCE/Reactors_Test.dsp
+++ b/tests/WinCE/Reactors_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Reactors_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Reactors_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reactors_Test.mak"\

- CFG="Reactors_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactors_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Reactors_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Reactors_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Reactors_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactors_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactors_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Reactors_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Reactors_Test - Win32 (WCE x86em) Debug"

 # Name "Reactors_Test - Win32 (WCE MIPS) Debug"

-# Name "Reactors_Test - Win32 (WCE SH) Debug"

+# Name "Reactors_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -454,7 +457,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -474,6 +476,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

@@ -571,7 +576,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -591,8 +595,11 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_REACT=\

 	"..\..\ace\ACE.h"\

@@ -688,7 +695,6 @@ DEP_CPP_REACT=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -708,6 +714,9 @@ DEP_CPP_REACT=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -728,7 +737,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -800,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -810,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

@@ -870,7 +881,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -880,8 +890,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -940,7 +953,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -950,6 +962,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -962,7 +977,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1032,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1043,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

 

@@ -1105,7 +1122,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1116,8 +1132,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1178,7 +1197,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1189,6 +1207,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Reader_Writer_Test.dsp b/tests/WinCE/Reader_Writer_Test.dsp
index 27dd9692469..e5675460b8a 100644
--- a/tests/WinCE/Reader_Writer_Test.dsp
+++ b/tests/WinCE/Reader_Writer_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Reader_Writer_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Reader_Writer_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Reader_Writer_Test.mak"\

- CFG="Reader_Writer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reader_Writer_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Reader_Writer_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Reader_Writer_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Reader_Writer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reader_Writer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reader_Writer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Reader_Writer_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Reader_Writer_Test - Win32 (WCE x86em) Debug"

 # Name "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

-# Name "Reader_Writer_Test - Win32 (WCE SH) Debug"

+# Name "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -419,7 +422,6 @@ DEP_CPP_READE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -428,6 +430,9 @@ DEP_CPP_READE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

@@ -490,7 +495,6 @@ DEP_CPP_READE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -499,8 +503,11 @@ DEP_CPP_READE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_READE=\

 	"..\..\ace\ACE.h"\

@@ -561,7 +568,6 @@ DEP_CPP_READE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -570,6 +576,9 @@ DEP_CPP_READE=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -590,7 +599,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -662,7 +671,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -672,6 +680,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

@@ -732,7 +743,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -742,8 +752,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -802,7 +815,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -812,6 +824,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -824,7 +839,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -894,7 +909,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -905,6 +919,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

 

@@ -967,7 +984,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -978,8 +994,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1040,7 +1059,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1051,6 +1069,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Recursive_Mutex_Test.dsp b/tests/WinCE/Recursive_Mutex_Test.dsp
index a10917b7298..6904ceb7cc5 100644
--- a/tests/WinCE/Recursive_Mutex_Test.dsp
+++ b/tests/WinCE/Recursive_Mutex_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Recursive_Mutex_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Recursive_Mutex_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak"\

- CFG="Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Recursive_Mutex_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Recursive_Mutex_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

 # Name "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

-# Name "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+# Name "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -419,7 +422,6 @@ DEP_CPP_RECUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -428,6 +430,9 @@ DEP_CPP_RECUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -490,7 +495,6 @@ DEP_CPP_RECUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -499,8 +503,11 @@ DEP_CPP_RECUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_RECUR=\

 	"..\..\ace\ACE.h"\

@@ -561,7 +568,6 @@ DEP_CPP_RECUR=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -570,6 +576,9 @@ DEP_CPP_RECUR=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -590,7 +599,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -662,7 +671,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -672,6 +680,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -732,7 +743,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -742,8 +752,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -802,7 +815,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -812,6 +824,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -824,7 +839,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -894,7 +909,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -905,6 +919,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -967,7 +984,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -978,8 +994,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1040,7 +1059,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1051,6 +1069,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/SOCK_Connector_Test.dsp b/tests/WinCE/SOCK_Connector_Test.dsp
index 88c58f8a9d0..15159c5b51c 100644
--- a/tests/WinCE/SOCK_Connector_Test.dsp
+++ b/tests/WinCE/SOCK_Connector_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=SOCK_Connector_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=SOCK_Connector_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SOCK_Connector_Test.mak"\

- CFG="SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Connector_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "SOCK_Connector_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "SOCK_Connector_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=SOCK_Connector_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

 # Name "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

-# Name "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+# Name "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -431,7 +434,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -439,6 +441,9 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

@@ -513,7 +518,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -521,8 +525,11 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_=\

 	"..\..\ace\ACE.h"\

@@ -595,7 +602,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -603,6 +609,9 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -623,7 +632,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -695,7 +704,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -705,6 +713,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

@@ -765,7 +776,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -775,8 +785,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -835,7 +848,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -845,6 +857,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -857,7 +872,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -927,7 +942,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -938,6 +952,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

 

@@ -1000,7 +1017,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1011,8 +1027,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1073,7 +1092,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1084,6 +1102,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/SOCK_Test.dsp b/tests/WinCE/SOCK_Test.dsp
index ee7aa9e8409..b4d012abf6f 100644
--- a/tests/WinCE/SOCK_Test.dsp
+++ b/tests/WinCE/SOCK_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=SOCK_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,18 +19,16 @@ CFG=SOCK_Test - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "SOCK_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "SOCK_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "SOCK_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SOCK_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SOCK_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

 

@@ -45,6 +43,9 @@ CFG=SOCK_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -53,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -78,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -113,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -141,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "SOCK_Test - Win32 (WCE x86em) Debug"

 # Name "SOCK_Test - Win32 (WCE MIPS) Debug"

-# Name "SOCK_Test - Win32 (WCE SH) Debug"

+# Name "SOCK_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -205,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -213,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -273,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -281,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -341,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -349,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -434,7 +438,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -444,6 +447,9 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -522,7 +528,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -532,8 +537,11 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_=\

 	"..\..\ace\ACE.h"\

@@ -610,7 +618,6 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -620,6 +627,9 @@ DEP_CPP_SOCK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -640,7 +650,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -712,7 +722,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -722,6 +731,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -782,7 +794,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -792,8 +803,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -852,7 +866,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -862,6 +875,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -874,7 +890,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -944,7 +960,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -955,6 +970,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

 

@@ -1017,7 +1035,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1028,8 +1045,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1090,7 +1110,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1101,6 +1120,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/SString_Test.dsp b/tests/WinCE/SString_Test.dsp
index 41419f33435..a6dc59239f1 100644
--- a/tests/WinCE/SString_Test.dsp
+++ b/tests/WinCE/SString_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=SString_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=SString_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "SString_Test.mak"\

- CFG="SString_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SString_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "SString_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "SString_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "SString_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SString_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SString_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=SString_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "SString_Test - Win32 (WCE x86em) Debug"

 # Name "SString_Test - Win32 (WCE MIPS) Debug"

-# Name "SString_Test - Win32 (WCE SH) Debug"

+# Name "SString_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_SSTRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_SSTRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SSTRI=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_SSTRI=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Semaphore_Test.dsp b/tests/WinCE/Semaphore_Test.dsp
index 73bf8dac7eb..b16a0c665db 100644
--- a/tests/WinCE/Semaphore_Test.dsp
+++ b/tests/WinCE/Semaphore_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Semaphore_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Semaphore_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Semaphore_Test.mak"\

- CFG="Semaphore_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Semaphore_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Semaphore_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Semaphore_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Semaphore_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Semaphore_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Semaphore_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Semaphore_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Semaphore_Test - Win32 (WCE x86em) Debug"

 # Name "Semaphore_Test - Win32 (WCE MIPS) Debug"

-# Name "Semaphore_Test - Win32 (WCE SH) Debug"

+# Name "Semaphore_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -419,7 +422,6 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -428,6 +430,9 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

@@ -490,7 +495,6 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -499,8 +503,11 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SEMAP=\

 	"..\..\ace\ACE.h"\

@@ -561,7 +568,6 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -570,6 +576,9 @@ DEP_CPP_SEMAP=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -590,7 +599,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -662,7 +671,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -672,6 +680,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

@@ -732,7 +743,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -742,8 +752,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -802,7 +815,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -812,6 +824,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -824,7 +839,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -894,7 +909,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -905,6 +919,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

 

@@ -967,7 +984,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -978,8 +994,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1040,7 +1059,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1051,6 +1069,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Sigset_Ops_Test.dsp b/tests/WinCE/Sigset_Ops_Test.dsp
index cbdd225faab..6b62347aef7 100644
--- a/tests/WinCE/Sigset_Ops_Test.dsp
+++ b/tests/WinCE/Sigset_Ops_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Sigset_Ops_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Sigset_Ops_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Sigset_Ops_Test.mak"\

- CFG="Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Sigset_Ops_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Sigset_Ops_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Sigset_Ops_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Sigset_Ops_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

 # Name "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

-# Name "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+# Name "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -417,13 +420,15 @@ DEP_CPP_SIGSE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

@@ -484,15 +489,17 @@ DEP_CPP_SIGSE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SIGSE=\

 	"..\..\ace\ACE.h"\

@@ -551,13 +558,15 @@ DEP_CPP_SIGSE=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -578,7 +587,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Simple_Message_Block_Test.dsp b/tests/WinCE/Simple_Message_Block_Test.dsp
index 7e6c32fe4b1..3b1b58779f9 100644
--- a/tests/WinCE/Simple_Message_Block_Test.dsp
+++ b/tests/WinCE/Simple_Message_Block_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Simple_Message_Block_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Simple_Message_Block_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak"\

- CFG="Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple_Message_Block_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Simple_Message_Block_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

 # Name "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

-# Name "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+# Name "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -419,13 +422,15 @@ DEP_CPP_SIMPL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -488,15 +493,17 @@ DEP_CPP_SIMPL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SIMPL=\

 	"..\..\ace\ACE.h"\

@@ -557,13 +564,15 @@ DEP_CPP_SIMPL=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -584,7 +593,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -656,7 +665,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -666,6 +674,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -726,7 +737,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -736,8 +746,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -796,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -806,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -818,7 +833,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -888,7 +903,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -899,6 +913,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

 

@@ -961,7 +978,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -972,8 +988,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1034,7 +1053,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1045,6 +1063,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/TSS_Test.dsp b/tests/WinCE/TSS_Test.dsp
index 66e6f96a8f1..8bcc288dd67 100644
--- a/tests/WinCE/TSS_Test.dsp
+++ b/tests/WinCE/TSS_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=TSS_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,18 +19,16 @@ CFG=TSS_Test - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TSS_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "TSS_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "TSS_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "TSS_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "TSS_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "TSS_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

 

@@ -45,6 +43,9 @@ CFG=TSS_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -53,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

@@ -78,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -113,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -141,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "TSS_Test - Win32 (WCE x86em) Debug"

 # Name "TSS_Test - Win32 (WCE MIPS) Debug"

-# Name "TSS_Test - Win32 (WCE SH) Debug"

+# Name "TSS_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -205,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -213,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

@@ -273,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -281,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -341,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -349,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -369,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -441,7 +445,6 @@ DEP_CPP_TSS_T=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -451,6 +454,9 @@ DEP_CPP_TSS_T=\
 	"..\test_config.h"\

 	"..\TSS_Test_Errno.h"\

 	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

@@ -511,7 +517,6 @@ DEP_CPP_TSS_T=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -521,8 +526,11 @@ DEP_CPP_TSS_T=\
 	"..\test_config.h"\

 	"..\TSS_Test_Errno.h"\

 	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TSS_T=\

 	"..\..\ace\ACE.h"\

@@ -581,7 +589,6 @@ DEP_CPP_TSS_T=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -591,6 +598,9 @@ DEP_CPP_TSS_T=\
 	"..\test_config.h"\

 	"..\TSS_Test_Errno.h"\

 	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -658,7 +668,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -668,6 +677,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

@@ -728,7 +740,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -738,8 +749,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -798,7 +812,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -808,6 +821,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -820,7 +836,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -890,7 +906,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -901,6 +916,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

 

@@ -963,7 +981,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -974,8 +991,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1036,7 +1056,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1047,6 +1066,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Task_Test.dsp b/tests/WinCE/Task_Test.dsp
index 3f545b3b2bf..87419d5a05b 100644
--- a/tests/WinCE/Task_Test.dsp
+++ b/tests/WinCE/Task_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Task_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,18 +19,16 @@ CFG=Task_Test - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Task_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Task_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Task_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Task_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Task_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Task_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

 

@@ -45,6 +43,9 @@ CFG=Task_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -53,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -78,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -113,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -141,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Task_Test - Win32 (WCE x86em) Debug"

 # Name "Task_Test - Win32 (WCE MIPS) Debug"

-# Name "Task_Test - Win32 (WCE SH) Debug"

+# Name "Task_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -205,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -213,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -273,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -281,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -341,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -349,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -369,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -478,7 +482,6 @@ DEP_CPP_TASK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -498,6 +501,9 @@ DEP_CPP_TASK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -595,7 +601,6 @@ DEP_CPP_TASK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -615,8 +620,11 @@ DEP_CPP_TASK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TASK_=\

 	"..\..\ace\ACE.h"\

@@ -712,7 +720,6 @@ DEP_CPP_TASK_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -732,6 +739,9 @@ DEP_CPP_TASK_=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -799,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -809,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -869,7 +881,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -879,8 +890,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -939,7 +953,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -949,6 +962,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -961,7 +977,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1031,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1042,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

 

@@ -1104,7 +1122,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1115,8 +1132,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1177,7 +1197,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1188,6 +1207,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Thread_Manager_Test.dsp b/tests/WinCE/Thread_Manager_Test.dsp
index a436096d2b3..26c7d1cafc6 100644
--- a/tests/WinCE/Thread_Manager_Test.dsp
+++ b/tests/WinCE/Thread_Manager_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Thread_Manager_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Thread_Manager_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Manager_Test.mak"\

- CFG="Thread_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Manager_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Thread_Manager_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Thread_Manager_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Thread_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Thread_Manager_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Thread_Manager_Test - Win32 (WCE x86em) Debug"

 # Name "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

-# Name "Thread_Manager_Test - Win32 (WCE SH) Debug"

+# Name "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -370,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -442,7 +445,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -450,6 +452,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

 	"..\Thread_Manager_Test.h"\

 	

 

@@ -512,7 +517,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -520,10 +524,13 @@ DEP_CPP_THREA=\
 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

 	"..\Thread_Manager_Test.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_THREA=\

 	"..\..\ace\ACE.h"\

@@ -582,7 +589,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -590,6 +596,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

 	"..\Thread_Manager_Test.h"\

 	

 

@@ -659,7 +668,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -669,6 +677,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -729,7 +740,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -739,8 +749,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -799,7 +812,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -809,6 +821,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -821,7 +836,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -891,7 +906,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -902,6 +916,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

 

@@ -964,7 +981,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -975,8 +991,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1037,7 +1056,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1048,6 +1066,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Thread_Mutex_Test.dsp b/tests/WinCE/Thread_Mutex_Test.dsp
index a11477dd8e5..720fc2cb14e 100644
--- a/tests/WinCE/Thread_Mutex_Test.dsp
+++ b/tests/WinCE/Thread_Mutex_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Thread_Mutex_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Thread_Mutex_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Mutex_Test.mak"\

- CFG="Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Mutex_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Thread_Mutex_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Thread_Mutex_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Thread_Mutex_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

 # Name "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

-# Name "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+# Name "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -370,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -442,7 +445,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -451,6 +453,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -511,7 +516,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -520,8 +524,11 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_THREA=\

 	"..\..\ace\ACE.h"\

@@ -580,7 +587,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Thread_Manager.h"\

@@ -589,6 +595,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -656,7 +665,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -666,6 +674,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -726,7 +737,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -736,8 +746,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -796,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -806,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -818,7 +833,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -888,7 +903,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -899,6 +913,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

 

@@ -961,7 +978,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -972,8 +988,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1034,7 +1053,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1045,6 +1063,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Thread_Pool_Test.dsp b/tests/WinCE/Thread_Pool_Test.dsp
index 111aa9a3a4c..45a0b2167cc 100644
--- a/tests/WinCE/Thread_Pool_Test.dsp
+++ b/tests/WinCE/Thread_Pool_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Thread_Pool_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Thread_Pool_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Thread_Pool_Test.mak"\

- CFG="Thread_Pool_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Pool_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Thread_Pool_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Thread_Pool_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Thread_Pool_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Pool_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Pool_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Thread_Pool_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Thread_Pool_Test - Win32 (WCE x86em) Debug"

 # Name "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

-# Name "Thread_Pool_Test - Win32 (WCE SH) Debug"

+# Name "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -370,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -479,7 +482,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -499,6 +501,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

@@ -596,7 +601,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -616,8 +620,11 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_THREA=\

 	"..\..\ace\ACE.h"\

@@ -713,7 +720,6 @@ DEP_CPP_THREA=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Task.h"\

 	"..\..\ace\Task.i"\

 	"..\..\ace\Task_T.cpp"\

@@ -733,6 +739,9 @@ DEP_CPP_THREA=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -800,7 +809,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -810,6 +818,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

@@ -870,7 +881,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -880,8 +890,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -940,7 +953,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -950,6 +962,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -962,7 +977,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -1032,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1043,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

 

@@ -1105,7 +1122,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1116,8 +1132,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1178,7 +1197,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1189,6 +1207,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Time_Value_Test.dsp b/tests/WinCE/Time_Value_Test.dsp
index aedd9d8ad3d..0b9a164a93f 100644
--- a/tests/WinCE/Time_Value_Test.dsp
+++ b/tests/WinCE/Time_Value_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Time_Value_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Time_Value_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Time_Value_Test.mak"\

- CFG="Time_Value_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Value_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Time_Value_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Time_Value_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Time_Value_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Time_Value_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Time_Value_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Time_Value_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Time_Value_Test - Win32 (WCE x86em) Debug"

 # Name "Time_Value_Test - Win32 (WCE MIPS) Debug"

-# Name "Time_Value_Test - Win32 (WCE SH) Debug"

+# Name "Time_Value_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -370,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -442,13 +445,15 @@ DEP_CPP_TIME_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

@@ -509,15 +514,17 @@ DEP_CPP_TIME_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TIME_=\

 	"..\..\ace\ACE.h"\

@@ -576,13 +583,15 @@ DEP_CPP_TIME_=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -650,7 +659,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -660,6 +668,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

@@ -720,7 +731,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -730,8 +740,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -790,7 +803,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -800,6 +812,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -812,7 +827,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -882,7 +897,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -893,6 +907,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

 

@@ -955,7 +972,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -966,8 +982,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1028,7 +1047,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1039,6 +1057,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

diff --git a/tests/WinCE/Timer_Queue_Test.dsp b/tests/WinCE/Timer_Queue_Test.dsp
index 94459449e3e..5b7d418b9d6 100644
--- a/tests/WinCE/Timer_Queue_Test.dsp
+++ b/tests/WinCE/Timer_Queue_Test.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

-# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

-# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

 

 CFG=Timer_Queue_Test - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -15,23 +15,20 @@ CFG=Timer_Queue_Test - Win32 (WCE x86em) Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Timer_Queue_Test.mak"\

- CFG="Timer_Queue_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timer_Queue_Test - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Application")

-!MESSAGE "Timer_Queue_Test - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Application")

-!MESSAGE "Timer_Queue_Test - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Application")

+!MESSAGE "Timer_Queue_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Timer_Queue_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Timer_Queue_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

 

@@ -46,6 +43,9 @@ CFG=Timer_Queue_Test - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "x86emDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

@@ -54,17 +54,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -79,29 +76,29 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WMIPSDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -114,27 +111,27 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCESHDbg"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

 # SUBTRACT LINK32 /pdb:none /nodefaultlib

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -142,7 +139,7 @@ PFILE=pfile.exe
 

 # Name "Timer_Queue_Test - Win32 (WCE x86em) Debug"

 # Name "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

-# Name "Timer_Queue_Test - Win32 (WCE SH) Debug"

+# Name "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

@@ -206,7 +203,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -214,6 +210,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -274,7 +273,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -282,8 +280,11 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -342,7 +343,6 @@ DEP_CPP_ACEAP=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -350,6 +350,9 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\ACEApp.h"\

 	"..\..\WindozeCE\stdafx.h"\

 	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -370,7 +373,7 @@ DEP_CPP_STDAF=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -446,7 +449,6 @@ DEP_CPP_TIMER=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -470,6 +472,9 @@ DEP_CPP_TIMER=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -534,7 +539,6 @@ DEP_CPP_TIMER=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -558,8 +562,11 @@ DEP_CPP_TIMER=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TIMER=\

 	"..\..\ace\ACE.h"\

@@ -622,7 +629,6 @@ DEP_CPP_TIMER=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Time_Value.h"\

@@ -646,6 +652,9 @@ DEP_CPP_TIMER=\
 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -713,7 +722,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -723,6 +731,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -783,7 +794,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -793,8 +803,11 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -853,7 +866,6 @@ DEP_CPP_WINDO=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -863,6 +875,9 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF 

 

@@ -875,7 +890,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -945,7 +960,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -956,6 +970,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

 

@@ -1018,7 +1035,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1029,8 +1045,11 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -1091,7 +1110,6 @@ DEP_CPP_WINDOZ=\
 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

-	"..\..\ace\sys_conf.h"\

 	"..\..\ace\Thread.h"\

 	"..\..\ace\Thread.i"\

 	"..\..\ace\Trace.h"\

@@ -1102,6 +1120,9 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCE.h"\

 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

 

 !ENDIF