Fixed windows build conflict issues.

This commit is contained in:
Juan Carlos Luciani
2007-04-06 03:52:43 +00:00
parent 0bfc0a3063
commit 3f0062dcf7
4 changed files with 88 additions and 22 deletions

View File

@@ -117,6 +117,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -168,7 +169,7 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="0"
ImportLibrary="$(SolutionDir)lib\windows/$(TargetName).lib"
ImportLibrary="$(SolutionDir)lib64\windows\$(TargetName).lib"
TargetMachine="17"
/>
<Tool
@@ -291,6 +292,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -337,7 +339,7 @@
SubSystem="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(SolutionDir)lib\windows\$(TargetName).lib"
ImportLibrary="$(SolutionDir)lib64\windows\$(TargetName).lib"
TargetMachine="17"
/>
<Tool