diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-02-05 11:02:44 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-02-08 22:04:12 +1100 |
| commit | d40a6bc695984ba0d35b795874f387f73cfadada (patch) | |
| tree | 5f28325bddf9272de4c4f85bc521e060845a4c0c /src/test_grabbag/picture | |
| parent | a5c8e8e14de182c4e8c5a8cd0b6be7c75ab6f021 (diff) | |
| download | flac-d40a6bc695984ba0d35b795874f387f73cfadada.tar.gz | |
libFLAC: Remove win_utf8_io dependency
Path-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'src/test_grabbag/picture')
| -rw-r--r-- | src/test_grabbag/picture/Makefile.am | 1 | ||||
| -rw-r--r-- | src/test_grabbag/picture/Makefile.lite | 4 | ||||
| -rw-r--r-- | src/test_grabbag/picture/test_picture.vcxproj | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am index 135a3361..fca16197 100644 --- a/src/test_grabbag/picture/Makefile.am +++ b/src/test_grabbag/picture/Makefile.am @@ -29,6 +29,7 @@ test_picture_SOURCES = \ test_picture_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ + $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ $(top_builddir)/src/libFLAC/libFLAC.la CLEANFILES = test_picture.exe diff --git a/src/test_grabbag/picture/Makefile.lite b/src/test_grabbag/picture/Makefile.lite index 10ebfe07..fe57b4c3 100644 --- a/src/test_grabbag/picture/Makefile.lite +++ b/src/test_grabbag/picture/Makefile.lite @@ -32,12 +32,8 @@ INCLUDES = -I./include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm else -ifeq ($(findstring Windows,$(OS)),Windows) - LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm -else LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm endif -endif SRCS_C = \ main.c diff --git a/src/test_grabbag/picture/test_picture.vcxproj b/src/test_grabbag/picture/test_picture.vcxproj index 3a6da466..588c19e6 100644 --- a/src/test_grabbag/picture/test_picture.vcxproj +++ b/src/test_grabbag/picture/test_picture.vcxproj @@ -171,10 +171,6 @@ <Project>{4cefbc81-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\share\win_utf8_io\win_utf8_io_static.vcxproj">
- <Project>{4cefbe02-c215-11db-8314-0800200c9a66}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
|