aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorblinkseb <blinkseb@svn>2010-05-17 18:25:38 +0000
committerblinkseb <blinkseb@svn>2010-05-17 18:25:38 +0000
commitb7c80f411e8605ee44850d2074e09fdbc85bbe31 (patch)
tree2f57e1e2d2172d7f49d2cadff11423cde6a4556f /lib
parent6d97effe2f1b3f17b98700f5fdbc15545e0dfe90 (diff)
[WIN32] Clean building. Now, all libs output in the "libs" folder, and objects files in the "objs" folder. This make the building tree a little more cleaner.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30260 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'lib')
-rw-r--r--lib/cpluff/libcpluff/win32/cpluff.vcproj10
-rw-r--r--lib/enca/libenca_win32/libenca_win32.vcproj12
-rw-r--r--lib/freetype/builds/win32/vc2008/freetype.vcproj8
-rw-r--r--lib/fribidi/libfridibidi/libfridibidi.vcproj8
-rw-r--r--lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj10
-rw-r--r--lib/libcdio/libcdio.vcproj8
-rw-r--r--lib/libiconv/libiconv_win32/libiconv_win32.vcproj8
-rw-r--r--lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj6
-rw-r--r--lib/libmodplug/libmodplug_2008.vcproj10
-rw-r--r--lib/pcre/libpcre/libpcre.vcproj8
10 files changed, 47 insertions, 41 deletions
diff --git a/lib/cpluff/libcpluff/win32/cpluff.vcproj b/lib/cpluff/libcpluff/win32/cpluff.vcproj
index 4cce0811a1..cd8947f29f 100644
--- a/lib/cpluff/libcpluff/win32/cpluff.vcproj
+++ b/lib/cpluff/libcpluff/win32/cpluff.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="cpluff"
ProjectGUID="{88968763-3D6B-48A8-B495-CC8C187FAC02}"
RootNamespace="cpluff"
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)\"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\cpluff\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\cpluff\$(ConfigurationName)\"
ConfigurationType="2"
CharacterSet="1"
>
@@ -95,8 +95,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)\"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\cpluff\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\cpluff\$(ConfigurationName)\"
ConfigurationType="2"
CharacterSet="1"
WholeProgramOptimization="1"
diff --git a/lib/enca/libenca_win32/libenca_win32.vcproj b/lib/enca/libenca_win32/libenca_win32.vcproj
index 305d1db7ad..b023eb611a 100644
--- a/lib/enca/libenca_win32/libenca_win32.vcproj
+++ b/lib/enca/libenca_win32/libenca_win32.vcproj
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
>
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="Debug\$(ProjectName).lib"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
@@ -81,8 +81,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -126,7 +126,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="Release\$(ProjectName).lib"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
/>
<Tool
Name="VCALinkTool"
diff --git a/lib/freetype/builds/win32/vc2008/freetype.vcproj b/lib/freetype/builds/win32/vc2008/freetype.vcproj
index 3cf86dd36d..deadfd3444 100644
--- a/lib/freetype/builds/win32/vc2008/freetype.vcproj
+++ b/lib/freetype/builds/win32/vc2008/freetype.vcproj
@@ -92,8 +92,8 @@
</Configuration>
<Configuration
Name="Release Multithreaded|Win32"
- OutputDirectory=".\..\..\..\objs\release_mt"
- IntermediateDirectory=".\..\..\..\objs\release_mt"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -391,8 +391,8 @@
</Configuration>
<Configuration
Name="Debug Multithreaded|Win32"
- OutputDirectory=".\..\..\..\objs\debug_mt"
- IntermediateDirectory=".\..\..\..\objs\debug_mt"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
diff --git a/lib/fribidi/libfridibidi/libfridibidi.vcproj b/lib/fribidi/libfridibidi/libfridibidi.vcproj
index 217c718bfa..b3d53bc735 100644
--- a/lib/fribidi/libfridibidi/libfridibidi.vcproj
+++ b/lib/fribidi/libfridibidi/libfridibidi.vcproj
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
>
@@ -81,8 +81,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
diff --git a/lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj b/lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj
index 9d3409b620..fa2836ddce 100644
--- a/lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj
+++ b/lib/libass/xbmc/libass_win32/libass_win32_vs2008.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="libass_dll"
ProjectGUID="{BA5B08FC-2ECB-4571-9F25-F8054522FC65}"
RootNamespace="libass_win32"
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
@@ -102,8 +102,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="1"
diff --git a/lib/libcdio/libcdio.vcproj b/lib/libcdio/libcdio.vcproj
index 00eb9a8299..809066f3f8 100644
--- a/lib/libcdio/libcdio.vcproj
+++ b/lib/libcdio/libcdio.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -86,8 +86,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
diff --git a/lib/libiconv/libiconv_win32/libiconv_win32.vcproj b/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
index 9b4f4364bc..b34d8202c7 100644
--- a/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
+++ b/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
>
@@ -81,8 +81,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
diff --git a/lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj b/lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj
index fd4ad84703..6dd3a1c003 100644
--- a/lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj
+++ b/lib/liblame/vc_solution/vc9_libmp3lame_dll.vcproj
@@ -20,6 +20,8 @@
<Configurations>
<Configuration
Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets=".\vc9_lame_config.vsprops"
UseOfMFC="0"
@@ -96,6 +98,8 @@
</Configuration>
<Configuration
Name="ReleaseNASM|Win32"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets=".\vc9_lame_config.vsprops"
UseOfMFC="0"
@@ -172,6 +176,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets=".\vc9_lame_config.vsprops"
UseOfMFC="0"
diff --git a/lib/libmodplug/libmodplug_2008.vcproj b/lib/libmodplug/libmodplug_2008.vcproj
index 33a1b1f3b5..f19eb9ad50 100644
--- a/lib/libmodplug/libmodplug_2008.vcproj
+++ b/lib/libmodplug/libmodplug_2008.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="libmodplug_2008"
ProjectGUID="{C15B374E-7126-48FF-B618-A375D7B17FCF}"
RootNamespace="libmodplug_2008"
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
@@ -89,8 +89,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
diff --git a/lib/pcre/libpcre/libpcre.vcproj b/lib/pcre/libpcre/libpcre.vcproj
index d6b4631d84..8406b9f425 100644
--- a/lib/pcre/libpcre/libpcre.vcproj
+++ b/lib/pcre/libpcre/libpcre.vcproj
@@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
>
@@ -83,8 +83,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)libs\$(ProjectName)\$(ConfigurationName)\"
+ IntermediateDirectory="$(SolutionDir)objs\$(ProjectName)\$(ConfigurationName)\"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"