Don't create the full name twice (<rdar://problem/23144358>)

[thirdparty/cups.git] / vcnet / libcups2.vcproj

diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index 13fa198725e45bc63c5a4c23d0e3cffb87674fdb..d22a863ba1c55ea342bed16fa418a6496f21952c 100644 (file)
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -4,6 +4,7 @@
        Version="9.00"\r
        Name="libcups2"\r
        ProjectGUID="{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}"\r
+       RootNamespace="libcups2"\r
        Keyword="Win32Proj"\r
        TargetFrameworkVersion="131072"\r
        >\r
@@ -44,8 +45,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +67,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalOptions="/NODEFAULTLIB:libcmt"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r
@@ -127,8 +129,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -149,10 +151,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="2"\r
-                               ModuleDefinitionFile="..\vc2005\libcups2.def"\r
+                               ModuleDefinitionFile="..\cups\libcups2.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\libcups2.pdb"\r
                                SubSystem="2"\r
@@ -207,8 +209,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -226,7 +228,8 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalOptions="/NODEFAULTLIB:libcmt"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r
@@ -260,7 +263,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="if not &quot;%RC_XBS%&quot; == &quot;YES&quot; goto END&#x0D;&#x0A;if not exist &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;   mkdir &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;xcopy /I/Y &quot;$(TargetPath)&quot;                                                                  &quot;$(DSTROOT)\Program Files\Bonjour\$(PlatformName)&quot;&#x0D;&#x0A;:END&#x0D;&#x0A;"\r
+                               CommandLine=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -290,8 +293,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
-                               AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\vcnet,..,..\vcnet\regex"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -309,10 +312,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="1"\r
-                               ModuleDefinitionFile="..\vc2005\libcups2.def"\r
+                               ModuleDefinitionFile="..\cups\libcups2.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="libcups2.pdb"\r
                                SubSystem="2"\r
@@ -477,6 +480,22 @@
                                RelativePath="..\cups\custom.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\debug.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-job.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-localization.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\dest-options.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\dest.c"\r
                                >\r
@@ -1021,6 +1040,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\libcups2.def"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\localize.c"\r
                                >\r
@@ -1209,6 +1232,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\ppd-cache.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\ppd.c"\r
                                >\r
@@ -1245,18 +1272,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\cups\pwg-file.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\cups\pwg-media.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\cups\pwg-ppd.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\cups\request.c"\r
                                >\r
@@ -1373,6 +1392,14 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\thread.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\tls.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\transcode.c"\r
                                >\r
@@ -1503,12 +1530,16 @@
                                RelativePath=".\config.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\cups-private.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\cups.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\debug.h"\r
+                               RelativePath="..\cups\debug-private.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1563,6 +1594,10 @@
                                RelativePath="..\cups\normalize.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\cups\ppd-private.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\cups\ppd.h"\r
                                >\r
@@ -1572,7 +1607,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\cups\string.h"\r
+                               RelativePath="..\cups\string-private.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\cups\thread-private.h"\r
                                >\r
                        </File>\r
                        <File\r