aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Eckels <eckels@google.com>2012-08-10 16:41:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-10 16:41:34 -0700
commit963811f445a859543349842102bb0d0478722009 (patch)
treec4f24b425e32f0509ae8ede5685bbfa22c18bbe7
parent53b03254ab684263bec2828b85bdd7b7ea2ab6f3 (diff)
parent54bd7000a2c3df8928c03d0314cf15a00f1abfb3 (diff)
downloadflac-jumper-stable-alt.tar.gz
Merge "Update flac Windows project for renamed dep path." into jumperjumper-stable-alt
-rw-r--r--src/libFLAC/libFLAC_static.vcproj8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libFLAC/libFLAC_static.vcproj b/src/libFLAC/libFLAC_static.vcproj
index 43728c7f..d6139119 100644
--- a/src/libFLAC/libFLAC_static.vcproj
+++ b/src/libFLAC/libFLAC_static.vcproj
@@ -40,7 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\include;..\..\include;&quot;$(ProjectDir)..\..\..\libogg-1.2.0\include&quot;"
+ AdditionalIncludeDirectories=".\include;..\..\include;&quot;$(ProjectDir)..\..\..\libogg\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT"
StringPooling="false"
RuntimeLibrary="3"
@@ -101,7 +101,7 @@
Optimization="2"
InlineFunctionExpansion="0"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories=".\include;..\..\include;&quot;$(ProjectDir)..\..\..\libogg-1.2.0\include&quot;"
+ AdditionalIncludeDirectories=".\include;..\..\include;&quot;$(ProjectDir)..\..\..\libogg\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL"
RuntimeLibrary="2"
FloatingPointModel="0"
@@ -145,11 +145,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\include\protected\all.h"
+ RelativePath=".\include\private\all.h"
>
</File>
<File
- RelativePath=".\include\private\all.h"
+ RelativePath=".\include\protected\all.h"
>
</File>
<File