From 07438df26321c7cb57576ff4c8778ee96e8df698 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Mon, 24 Mar 2014 18:09:07 -0500 Subject: [PATCH] FS-6293 fix windows build from version.h being added to xmlrpc --- libs/win32/xmlrpc-c/xmlparse.2010.vcxproj | 506 +++++++++++----------- libs/win32/xmlrpc-c/xmlparse.2012.vcxproj | 2 +- 2 files changed, 254 insertions(+), 254 deletions(-) diff --git a/libs/win32/xmlrpc-c/xmlparse.2010.vcxproj b/libs/win32/xmlrpc-c/xmlparse.2010.vcxproj index 3c77a24ddf..b3d26a2c08 100644 --- a/libs/win32/xmlrpc-c/xmlparse.2010.vcxproj +++ b/libs/win32/xmlrpc-c/xmlparse.2010.vcxproj @@ -1,254 +1,254 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - xmlparse - {0D108721-EAE8-4BAF-8102-D8960EC93647} - xmlparse - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\xmlparse\$(Configuration)\ - $(PlatformName)\xmlparse\$(Configuration)\ - $(PlatformName)\xmlparse\$(Configuration)\ - $(PlatformName)\xmlparse\$(Configuration)\ - $(ProjectDir)..\version.h;$(ExtensionsToDeleteOnClean) - Clean - Clean - Clean - Clean - - - - MaxSpeed - OnlyExplicitInline - $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - - - if not exist "$(XMLRPCDir)version.h" ( -pushd $(XMLRPCDir)Windows -"ConfigureWin32.bat" -popd -) - - - - pushd $(XMLRPCDir)Windows -"$(XMLRPCDir)Windows\CleanWin32.bat" -popd - - NoOutput - - - - - X64 - - - MaxSpeed - OnlyExplicitInline - $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - - - if not exist "$(XMLRPCDir)version.h" ( -pushd $(XMLRPCDir)Windows -"ConfigureWin32.bat" -popd -) - - - - pushd $(XMLRPCDir)Windows -"$(XMLRPCDir)Windows\CleanWin32.bat" -popd - - NoOutput - - - - - Disabled - $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - - - if not exist "$(XMLRPCDir)version.h" ( -pushd $(XMLRPCDir)Windows -"ConfigureWin32.bat" -popd -) - - - - pushd $(XMLRPCDir)Windows -"$(XMLRPCDir)Windows\CleanWin32.bat" -popd - - NoOutput - - - - - X64 - - - Disabled - $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - true - - - if not exist "$(XMLRPCDir)version.h" ( -pushd $(XMLRPCDir)Windows -"ConfigureWin32.bat" -popd -) - - - - pushd $(XMLRPCDir)Windows -"$(XMLRPCDir)Windows\CleanWin32.bat" -popd - - NoOutput - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + xmlparse + {0D108721-EAE8-4BAF-8102-D8960EC93647} + xmlparse + + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + StaticLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(PlatformName)\xmlparse\$(Configuration)\ + $(ProjectDir)..\version.h;$(ExtensionsToDeleteOnClean) + Clean + Clean + Clean + Clean + + + + MaxSpeed + OnlyExplicitInline + $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + true + + + if not exist "$(XMLRPCDir)version.h" ( +pushd $(XMLRPCDir)Windows +"ConfigureWin32.bat" +popd +) + + + + pushd $(XMLRPCDir)Windows +"$(XMLRPCDir)Windows\CleanWin32.bat" +popd + + NoOutput + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + true + + + if not exist "$(XMLRPCDir)version.h" ( +pushd $(XMLRPCDir)Windows +"ConfigureWin32.bat" +popd +) + + + + pushd $(XMLRPCDir)Windows +"$(XMLRPCDir)Windows\CleanWin32.bat" +popd + + NoOutput + + + + + Disabled + $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + true + + + if not exist "$(XMLRPCDir)version.h" ( +pushd $(XMLRPCDir)Windows +"ConfigureWin32.bat" +popd +) + + + + pushd $(XMLRPCDir)Windows +"$(XMLRPCDir)Windows\CleanWin32.bat" +popd + + NoOutput + + + + + X64 + + + Disabled + $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + true + + + if not exist "$(XMLRPCDir)xmlrpc_config.h" ( +pushd $(XMLRPCDir)Windows +"ConfigureWin32.bat" +popd +) + + + + pushd $(XMLRPCDir)Windows +"$(XMLRPCDir)Windows\CleanWin32.bat" +popd + + NoOutput + + + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj index 8dc7a0d927..aef5a0d569 100644 --- a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj +++ b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj @@ -235,7 +235,7 @@ popd true - if not exist "$(XMLRPCDir)version.h" ( + if not exist "$(XMLRPCDir)xmlrpc_config.h" ( pushd $(XMLRPCDir)Windows "ConfigureWin32.bat" popd