Paul Querna wrote:
> Could you please create a single unified 'diff' patch file with your
> changes, and either attach it to a mail, or post a URL?
I can't post to a URL and the mailing list daemon won't allow me to send
zipped attachments nor attachments totaling more than 100KB. Anyway, I can
send you the diffs. I diffed the project files against the converted VS2005
Win32 ones.
Index: apr/file_io/win32/seek.c
===================================================================
--- file_io/win32/seek.c (revision 550807)
+++ file_io/win32/seek.c (working copy)
@@ -16,7 +16,9 @@
#include "win32/apr_arch_file_io.h"
#include "apr_file_io.h"
-#include <errno.h>
+#if APR_HAVE_ERRNO_H
+#include "errno.h"
+#endif
#include <string.h>
static apr_status_t setptr(apr_file_t *thefile, apr_off_t pos )
Index: apr/include/apr.hw
===================================================================
--- include/apr.hw (revision 550807)
+++ include/apr.hw (working copy)
@@ -36,7 +36,7 @@
* for Win32 or Netware by those build environments, respectively.
*/
-#if defined(WIN32) || defined(DOXYGEN)
+#if defined(WIN32) || defined(_WIN32_WCE) || defined(DOXYGEN)
/* Ignore most warnings (back down to /W3) for poorly constructed headers
*/
@@ -402,7 +402,7 @@
#define APR_THREAD_FUNC __stdcall
-#if defined(DOXYGEN) || !defined(WIN32)
+#if defined(DOXYGEN) || !defined(WIN32) && !defined(_WIN32_WCE)
/**
* The public APR functions are declared with APR_DECLARE(), so they may
Index: apr/misc/win32/start.c
===================================================================
--- misc/win32/start.c (revision 550807)
+++ misc/win32/start.c (working copy)
@@ -23,7 +23,9 @@
#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */
#include "wchar.h"
#include "apr_arch_file_io.h"
+#ifndef _WIN32_WCE
#include "crtdbg.h"
+#endif
#include "assert.h"
/* This symbol is _private_, although it must be exported.
Index: apr/libapr.vcproj
===================================================================
--- apr/libapr.vcproj Tue Jul 24 13:31:54 2007
+++ apr/apr/ce-libapr.vcproj Tue Jul 24 15:57:09 2007
@@ -2,27 +2,25 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libapr"
- ProjectGUID="{0B16BD1E-2FF8-4BCF-840A-A09B29B72F93}"
- RootNamespace="libapr"
+ Name="ce-libapr"
+ ProjectGUID="{B0864E89-D0BD-44DF-8700-8BCEE4B467C6}"
+ RootNamespace="ce-libapr"
+ Keyword="Win32Proj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,29 +40,28 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Debug/libapr.tlb"
+ TypeLibraryName="$(OutDir)/libapr.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/EHsc "
+ ExecutionBucket="7"
Optimization="0"
+ FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
-
PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;APR_DECLARE_EXPORT;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+ StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\Debug/libapr.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName="Debug\libapr_src"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)\libapr_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CallingConvention="0"
CompileAs="1"
/>
<Tool
@@ -72,7 +69,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="_DEBUG,APR_VERSION_ONLY"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;APR_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include"
/>
@@ -81,53 +78,52 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
AdditionalDependencies="ws2_32.lib mswsock.lib
rpcrt4.lib"
- OutputFile="Debug/libapr-1.dll"
+ OutputFile="$(OutDir)/libapr-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
+ DelayLoadDLLs="$(NOINHERIT)"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/libapr-1.pdb"
- SubSystem="2"
- BaseAddress="0x6EEC0000"
- ImportLibrary=".\Debug/libapr-1.lib"
- TargetMachine="1"
+ ProgramDatabaseFile="$(OutDir)/libapr-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
+ ImportLibrary="$(OutDir)/libapr-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/libapr.bsc"
+ OutputFile="$(IntDir)/libapr.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -147,32 +143,29 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/libapr.tlb"
+ TypeLibraryName="$(OutDir)/libapr.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
-
PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;APR_DECLARE_EXPORT;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
- RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\Release/libapr.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName="Release\libapr_src"
+ FloatingPointModel="0"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)\libapr_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
- CallingConvention="0"
CompileAs="1"
/>
<Tool
@@ -180,7 +173,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="NDEBUG,APR_VERSION_ONLY"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;APR_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include"
/>
@@ -189,44 +182,46 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
AdditionalDependencies="ws2_32.lib mswsock.lib
rpcrt4.lib"
- OutputFile="Release/libapr-1.dll"
+ OutputFile="$(OutDir)/libapr-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ProgramDatabaseFile=".\Release/libapr-1.pdb"
- SubSystem="2"
+ DelayLoadDLLs="$(NOINHERIT)"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(OutDir)/libapr-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
- BaseAddress="0x6EEC0000"
- ImportLibrary=".\Release/libapr-1.lib"
- TargetMachine="1"
+ ImportLibrary="$(OutDir)/libapr-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Release/libapr.bsc"
+ OutputFile="$(IntDir)/libapr.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
</Configurations>
@@ -235,7 +230,8 @@
<Files>
<Filter
Name="Source Files"
- Filter=".c"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<Filter
Name="atomic"
@@ -1780,6 +1776,8 @@
</Filter>
<Filter
Name="Private Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="include\arch\win32\apr_arch_atime.h"
@@ -1832,6 +1830,8 @@
</Filter>
<Filter
Name="Public Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{E350AC61-1560-46f8-951B-9F3E9F6A1856}"
>
<File
RelativePath="include\apr.h.in"
@@ -2034,28 +2034,34 @@
>
</File>
</Filter>
- <File
- RelativePath="libapr.rc"
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <FileConfiguration
- Name="Debug|Win32"
+ <File
+ RelativePath="libapr.rc"
>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Index: apr-util/libaprutil.vcproj
===================================================================
--- apr-util/libaprutil.vcproj Wed Jun 27 08:52:45 2007
+++ apr-util/ce-libaprutil.vcproj Tue Jul 24 15:58:03 2007
@@ -2,27 +2,25 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libaprutil"
- ProjectGUID="{F94005DA-034C-4288-983C-D4320DACA06E}"
- RootNamespace="libaprutil"
+ Name="ce-libaprutil"
+ ProjectGUID="{15F43223-0298-4637-9D5A-26AA98AC09BC}"
+ RootNamespace="ce-libaprutil"
+ Keyword="Win32Proj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,28 +40,27 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Debug/libaprutil.tlb"
+ TypeLibraryName="$(OutDir)/libaprutil.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/EHsc "
+ ExecutionBucket="7"
Optimization="0"
+ FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="./include;../apr/include;./include/private;"../apr-iconv/include";./dbm/sdbm;./xml/expat/lib;"C:\Program
Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include""
-
PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;APU_DECLARE_EXPORT;APU_USE_SDBM;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+ StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\Debug/libaprutil.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName="Debug\libaprutil_src"
+ UsePrecompiledHeader="0"
+
ProgramDataBaseFileName="$(IntDir)\libaprutil_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
CallingConvention="0"
CompileAs="1"
/>
@@ -72,7 +69,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="_DEBUG,APU_VERSION_ONLY"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;APU_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include;../apr/include"
/>
@@ -81,54 +78,53 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
AdditionalDependencies="ws2_32.lib mswsock.lib
wldap32.lib"
- OutputFile="Debug/libaprutil-1.dll"
+ OutputFile="$(OutDir)/libaprutil-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""C:\Program
Files\Microsoft Visual
Studio .NET 2003\Vc7\PlatformSDK\Lib""
+ DelayLoadDLLs="$(NOINHERIT)"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/libaprutil-1.pdb"
- SubSystem="2"
- BaseAddress="0x6EE60000"
- ImportLibrary=".\Debug/libaprutil-1.lib"
- TargetMachine="1"
+ ProgramDatabaseFile="$(OutDir)/libaprutil-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
+ ImportLibrary="$(OutDir)/libaprutil-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/libaprutil.bsc"
+ OutputFile="$(IntDir)/libaprutil.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -148,30 +144,28 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/libaprutil.tlb"
+ TypeLibraryName="$(OutDir)/libaprutil.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./include;../apr/include;./include/private;"../apr-iconv/include";./dbm/sdbm;./xml/expat/lib;"C:\Program
Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include""
-
PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;APU_DECLARE_EXPORT;APU_USE_SDBM;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\Release/libaprutil.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName="Release\libaprutil_src"
+ UsePrecompiledHeader="0"
+
ProgramDataBaseFileName="$(IntDir)\libaprutil_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
CallingConvention="0"
CompileAs="1"
@@ -181,7 +175,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="NDEBUG,APU_VERSION_ONLY"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;APU_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include;../apr/include"
/>
@@ -190,45 +184,47 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
AdditionalDependencies="ws2_32.lib mswsock.lib
wldap32.lib"
- OutputFile="Release/libaprutil-1.dll"
+ OutputFile="$(OutDir)/libaprutil-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""C:\Program
Files\Microsoft Visual
Studio .NET 2003\Vc7\PlatformSDK\Lib""
- ProgramDatabaseFile=".\Release/libaprutil-1.pdb"
- SubSystem="2"
+ DelayLoadDLLs="$(NOINHERIT)"
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile="$(OutDir)/libaprutil-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
- BaseAddress="0x6EE60000"
- ImportLibrary=".\Release/libaprutil-1.lib"
- TargetMachine="1"
+ ImportLibrary="$(OutDir)/libaprutil-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Release/libaprutil.bsc"
+ OutputFile="$(IntDir)/libaprutil.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
</Configurations>
@@ -237,6 +233,8 @@
<Files>
<Filter
Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{1B4D2EC3-3951-4c61-AEE3-C8D46141811C}"
>
<Filter
Name="buckets"
@@ -1273,6 +1271,7 @@
</Filter>
<Filter
Name="Generated Files"
+
UniqueIdentifier="{C1CD40D1-2FA6-4bc7-AC9F-47BEFA5E1686}"
>
<File
RelativePath="include\apr_ldap.h.in"
@@ -1429,6 +1428,8 @@
</Filter>
<Filter
Name="Public Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{B0FAB9C2-D880-40cd-9A83-87E92374286F}"
>
<File
RelativePath="include\apr_anylock.h"
@@ -1519,28 +1520,34 @@
>
</File>
</Filter>
- <File
- RelativePath="libaprutil.rc"
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{AE8FEB73-F1CA-44fe-A033-230B1BF16D56}"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
+ <File
+ RelativePath="libaprutil.rc"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Index: apr-util/xml/expat/lib/xml.vcproj
===================================================================
--- apr-util/xml/expat/lib/xml.vcproj Tue Jul 24 13:36:31 2007
+++ apr-util/xml/expat/lib/ce-xml.vcproj Tue Jul 24 15:58:18 2007
@@ -2,27 +2,25 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="xml"
- ProjectGUID="{6D44FC1C-FCF0-49F7-AD35-2818D977AC6E}"
- RootNamespace="xml"
+ Name="ce-xml"
+ ProjectGUID="{7C179AA4-A9A0-4E18-9835-6FB6ABB7EC32}"
+ RootNamespace="ce-xml"
+ Keyword="Win32Proj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\LibD"
- IntermediateDirectory=".\LibD"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -41,23 +39,23 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/EHsc "
+ ExecutionBucket="7"
Optimization="0"
+ FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="."
-
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\"expat_1.95.2\""
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;VERSION=\"expat_1.95.2\"$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
StringPooling="true"
+ MinimalRebuild="true"
ExceptionHandling="0"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\LibD/xml.pch"
- AssemblerListingLocation=".\LibD/"
- ObjectFile=".\LibD/"
- ProgramDataBaseFileName="LibD\xml_src"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(OutDir)\xml_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="1"
/>
@@ -66,14 +64,17 @@
/>
<Tool
Name="VCResourceCompilerTool"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE"
Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\LibD\xml.lib"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
+ OutputFile="$(OutDir)/xml.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -85,24 +86,29 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\LibD/xml.bsc"
+ OutputFile="$(IntDir)/xml.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\LibR"
- IntermediateDirectory=".\LibR"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -121,25 +127,24 @@
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="."
-
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\"expat_1.95.2\""
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;VERSION=\"expat_1.95.2\"$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\LibR/xml.pch"
- AssemblerListingLocation=".\LibR/"
- ObjectFile=".\LibR/"
- ProgramDataBaseFileName="LibR\xml_src"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(OutDir)\xml_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
CompileAs="1"
/>
@@ -148,14 +153,17 @@
/>
<Tool
Name="VCResourceCompilerTool"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE"
Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile=".\LibR\xml.lib"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
+ OutputFile="$(OutDir)/xml.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -167,14 +175,22 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\LibR/xml.bsc"
+ OutputFile="$(IntDir)/xml.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
</Configurations>
<References>
@@ -182,7 +198,8 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="xmlparse.c"
@@ -301,7 +318,8 @@
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="ascii.h"
@@ -350,6 +368,8 @@
</Filter>
<Filter
Name="Generated Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{D8EF142E-74B0-472f-B486-85B76B5C8224}"
>
<File
RelativePath="expat.h.in"
@@ -400,10 +420,12 @@
</FileConfiguration>
</File>
</Filter>
- <File
- RelativePath="ReadMe.txt"
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Index: apr-iconv/libapriconv.vcproj
===================================================================
--- apr-iconv/libapriconv.vcproj Wed Jun 27 08:52:45 2007
+++ apr-iconv/ce-libapriconv.vcproj Tue Jul 24 15:57:23 2007
@@ -2,27 +2,25 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libapriconv"
- ProjectGUID="{50D4AC8D-91EB-47E5-975B-43DCF125DAA6}"
- RootNamespace="libapriconv"
+ Name="ce-libapriconv"
+ ProjectGUID="{5822974D-52F3-4270-9FF1-2EE6BE60F9A6}"
+ RootNamespace="ce-libapriconv"
+ Keyword="Win32Proj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -42,28 +40,28 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Debug/libapriconv.tlb"
+ TypeLibraryName="$(OutDir)/libapriconv.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
+ FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="./include,../apr/include"
-
PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;API_DECLARE_EXPORT;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+ StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
- PrecompiledHeaderFile=".\Debug/libapriconv.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName="Debug\libapriconv_src"
+ UsePrecompiledHeader="0"
+
ProgramDataBaseFileName="$(IntDir)\libapriconv_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
- CallingConvention="0"
CompileAs="1"
/>
<Tool
@@ -71,7 +69,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="_DEBUG,API_VERSION_ONLY"
+
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;API_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include;../apr/include"
/>
@@ -80,52 +78,51 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="Debug/libapriconv-1.dll"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
+ OutputFile="$(OutDir)/libapriconv-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
+ DelayLoadDLLs="$(NOINHERIT)"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/libapriconv-1.pdb"
- SubSystem="2"
- BaseAddress="0x6EE50000"
- ImportLibrary=".\Debug/libapriconv-1.lib"
- TargetMachine="1"
+
ProgramDatabaseFile="$(OutDir)/libapriconv-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
+ ImportLibrary="$(OutDir)/libapriconv-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/libapriconv.bsc"
+ OutputFile="$(IntDir)/libapriconv.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -145,32 +142,30 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/libapriconv.tlb"
+ TypeLibraryName="$(OutDir)/libapriconv.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./include,../apr/include"
-
PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;API_DECLARE_EXPORT;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
+ FloatingPointModel="0"
RuntimeTypeInfo="false"
-
PrecompiledHeaderFile=".\Release/libapriconv.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
-
ProgramDataBaseFileName="Release\libapriconv_src"
+ UsePrecompiledHeader="0"
+
ProgramDataBaseFileName="$(IntDir)\libapriconv_src"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
- CallingConvention="0"
CompileAs="1"
/>
<Tool
@@ -178,7 +173,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
-
PreprocessorDefinitions="NDEBUG,API_VERSION_ONLY"
+
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;API_VERSION_ONLY"
Culture="1033"
AdditionalIncludeDirectories="./include;../apr/include"
/>
@@ -187,43 +182,45 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="Release/libapriconv-1.dll"
+ AdditionalOptions=" /subsystem:windowsce,5.00"
+ OutputFile="$(OutDir)/libapriconv-1.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
-
ProgramDatabaseFile=".\Release/libapriconv-1.pdb"
- SubSystem="2"
+ DelayLoadDLLs="$(NOINHERIT)"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile="$(OutDir)/libapriconv-1.pdb"
+ SubSystem="0"
+ StackReserveSize="65536"
+ StackCommitSize="4096"
OptimizeReferences="2"
EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
- BaseAddress="0x6EE50000"
- ImportLibrary=".\Release/libapriconv-1.lib"
- TargetMachine="1"
+ ImportLibrary="$(OutDir)/libapriconv-1.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Release/libapriconv.bsc"
+ OutputFile="$(IntDir)/libapriconv.bsc"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCPostBuildEventTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
/>
- <Tool
- Name="VCPostBuildEventTool"
+ <DebuggerTool
/>
</Configuration>
</Configurations>
@@ -232,7 +229,8 @@
<Files>
<Filter
Name="Source Files"
- Filter=".c"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{63B8A19A-AD76-42e5-831C-40BF2C924DF1}"
>
<Filter
Name="lib"
@@ -395,7 +393,8 @@
</Filter>
<Filter
Name="Header Files"
- Filter=".h"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{0B3E5F87-CF74-40c7-9597-67935BB52AF3}"
>
<File
RelativePath="include\api_version.h"
@@ -414,28 +413,34 @@
>
</File>
</Filter>
- <File
- RelativePath="libapriconv.rc"
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{9C0CE884-33B1-492c-A854-AD409FEA7C9A}"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
+ <File
+ RelativePath="libapriconv.rc"
>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Index: apr-iconv/ccs/libapriconv_ccs_modules.vcproj
===================================================================
--- apr-iconv/ccs/libapriconv_ccs_modules.vcproj Tue Jul 24 14:18:39 2007
+++ apr-iconv/ccs/ce-libapriconv_ccs_modules.vcproj Tue Jul 24 15:57:36 2007
@@ -2,34 +2,32 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libapriconv_ccs_modules"
- ProjectGUID="{77C4E24E-64A3-4723-98D6-884940B4DED9}"
- RootNamespace="libapriconv_ccs_modules"
+ Name="ce-libapriconv_ccs_modules"
+ ProjectGUID="{EB4C29E5-240A-4EDE-9BE1-E865621DBA93}"
+ RootNamespace="ce-libapriconv_ccs_modules"
Keyword="MakeFileProj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\Debug\iconv"
- IntermediateDirectory=".\..\Debug\iconv"
- ConfigurationType="0"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+
OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+
IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+ ConfigurationType="4"
+ CharacterSet="1"
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="NMAKE /nologo /f Makefile.win
BUILD_MODE=debug
BIND_MODE=shared"
ReBuildCommandLine="NMAKE /nologo /f
Makefile.win BUILD_MODE=debug
BIND_MODE=shared /a"
CleanCommandLine=""
- Output="Debug"
+ Output="$(OutDir)"
PreprocessorDefinitions=""
IncludeSearchPath=""
ForcedIncludes=""
@@ -39,20 +37,18 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\Release\iconv"
- IntermediateDirectory=".\..\Release\iconv"
- ConfigurationType="0"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+
OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+
IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+ ConfigurationType="4"
+ CharacterSet="1"
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="NMAKE /nologo /f Makefile.win
BUILD_MODE=release
BIND_MODE=shared"
ReBuildCommandLine="NMAKE /nologo /f
Makefile.win BUILD_MODE=release
BIND_MODE=shared /a"
CleanCommandLine=""
- Output="Release"
+ Output="$(OutDir)"
PreprocessorDefinitions=""
IncludeSearchPath=""
ForcedIncludes=""
@@ -67,7 +63,8 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{6A610FCB-4552-4cdf-80DC-193D7C4742F3}"
>
<File
RelativePath="adobe-stdenc.c"
@@ -848,12 +845,19 @@
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{5A83F435-A1D5-49c7-90E2-1603A4E1F1C4}"
>
<File
RelativePath="..\lib\iconv.h"
>
</File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{19D67D4A-0674-4505-BF21-5015F0112C9C}"
+ >
</Filter>
</Files>
<Globals>
Index: apr-iconv/ces/libapriconv_ces_modules.vcproj
===================================================================
--- apr-iconv/ces/libapriconv_ces_modules.vcproj Tue Jul 24 14:24:59 2007
+++ apr-iconv/ces/ce-libapriconv_ces_modules.vcproj Tue Jul 24 15:57:51 2007
@@ -2,33 +2,32 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libapriconv_ces_modules"
- ProjectGUID="{841BB579-6127-44E6-907F-08F3504A1164}"
+ Name="ce-libapriconv_ces_modules"
+ ProjectGUID="{CABD1B3B-B6AE-4259-AD3D-AF9900ECAA62}"
+ RootNamespace="ce-libapriconv_ces_modules"
Keyword="MakeFileProj"
>
<Platforms>
<Platform
- Name="Win32"
+ Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\Debug\iconv"
- IntermediateDirectory=".\..\Debug\iconv"
- ConfigurationType="0"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+
OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+
IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+ ConfigurationType="4"
+ CharacterSet="1"
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="NMAKE /nologo /f Makefile.win
BUILD_MODE=debug
BIND_MODE=shared"
ReBuildCommandLine="NMAKE /nologo /f
Makefile.win BUILD_MODE=debug
BIND_MODE=shared /a"
CleanCommandLine=""
- Output="Debug"
+ Output="$(OutDir)"
PreprocessorDefinitions=""
IncludeSearchPath=""
ForcedIncludes=""
@@ -38,20 +37,18 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory=".\..\Release\iconv"
- IntermediateDirectory=".\..\Release\iconv"
- ConfigurationType="0"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+
OutputDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+
IntermediateDirectory="..\$(PlatformName)\$(ConfigurationName)\iconv"
+ ConfigurationType="4"
+ CharacterSet="1"
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="NMAKE /nologo /f Makefile.win
BUILD_MODE=release
BIND_MODE=shared"
ReBuildCommandLine="NMAKE /nologo /f
Makefile.win BUILD_MODE=release
BIND_MODE=shared /a"
CleanCommandLine=""
- Output="Release"
+ Output="$(OutDir)"
PreprocessorDefinitions=""
IncludeSearchPath=""
ForcedIncludes=""
@@ -66,7 +63,8 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+
UniqueIdentifier="{0CC518BD-60FE-4b64-92FA-90DF2653FDB2}"
>
<File
RelativePath="_tbl_simple.c"
@@ -135,12 +133,19 @@
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+
UniqueIdentifier="{B3BB5334-C6B8-4929-80E5-53FE92C4D712}"
>
<File
RelativePath="..\lib\iconv.h"
>
</File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+
UniqueIdentifier="{84B7756B-A8FA-4397-9F8A-B3941AD9987B}"
+ >
</Filter>
</Files>
<Globals>
