summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2013-10-04 13:50:01 +1000
committerErik de Castro Lopo <erikd@mega-nerd.com>2013-10-04 13:50:01 +1000
commita1abfa3df29fc7fcb8cee35365c51db8fbc99dbc (patch)
tree4b878bdfa73769888f3f002c4a88a8907f62b734 /examples
parentecd0acba75e7961b60465c5ee3b6876b407803ca (diff)
downloadflac-a1abfa3df29fc7fcb8cee35365c51db8fbc99dbc.tar.gz
Vcproj file updates.
rplaces OutputDirectory="..\..\..\..\objs\debug\bin" with OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin and so on. Rmoves OutputFile="..\..\objs\debug\lib\$(ProjectName).lib when possible. Also, in the current version "Whole program optimization" compiler option is set, but the corresponding linker option isn't. From MSDN: "If you do not explicitly specify /LTCG when you pass /GL or MSIL modules to the linker, the linker eventually detects this and restarts the link by using /LTCG. Explicitly specify /LTCG when you pass /GL and MSIL modules to the linker for the fastest possible build performance." So /LTCG option was added too. Debug build now uses libogg_static.lib from .\objs\debug\lib folder. (the dependency for both release and debug is objs\$(ConfigurationName)\lib\libogg_static.lib) Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/c/decode/file/example_c_decode_file.vcproj13
-rw-r--r--examples/c/encode/file/example_c_encode_file.vcproj13
-rw-r--r--examples/cpp/decode/file/example_cpp_decode_file.vcproj13
-rw-r--r--examples/cpp/encode/file/example_cpp_encode_file.vcproj13
4 files changed, 28 insertions, 24 deletions
diff --git a/examples/c/decode/file/example_c_decode_file.vcproj b/examples/c/decode/file/example_c_decode_file.vcproj
index 2498c816..15f108cc 100644
--- a/examples/c/decode/file/example_c_decode_file.vcproj
+++ b/examples/c/decode/file/example_c_decode_file.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/examples/c/encode/file/example_c_encode_file.vcproj b/examples/c/encode/file/example_c_encode_file.vcproj
index 4d10ac55..fb08db0c 100644
--- a/examples/c/encode/file/example_c_encode_file.vcproj
+++ b/examples/c/encode/file/example_c_encode_file.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/examples/cpp/decode/file/example_cpp_decode_file.vcproj b/examples/cpp/decode/file/example_cpp_decode_file.vcproj
index b09bc0fe..7463bca8 100644
--- a/examples/cpp/decode/file/example_cpp_decode_file.vcproj
+++ b/examples/cpp/decode/file/example_cpp_decode_file.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
diff --git a/examples/cpp/encode/file/example_cpp_encode_file.vcproj b/examples/cpp/encode/file/example_cpp_encode_file.vcproj
index 38a3e26d..333b2033 100644
--- a/examples/cpp/encode/file/example_cpp_encode_file.vcproj
+++ b/examples/cpp/encode/file/example_cpp_encode_file.vcproj
@@ -17,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\..\objs\debug\bin"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
>
<Tool
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"
@@ -93,9 +93,10 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\..\objs\release\bin"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)objs\$(ConfigurationName)\bin"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -140,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\..\objs\release\lib\libogg_static.lib"
+ AdditionalDependencies="$(SolutionDir)objs\$(ConfigurationName)\lib\libogg_static.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="uuid.lib"
GenerateDebugInformation="true"