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_libFLAC | |
| 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_libFLAC')
| -rw-r--r-- | src/test_libFLAC/Makefile.am | 8 | ||||
| -rw-r--r-- | src/test_libFLAC/Makefile.lite | 4 | ||||
| -rw-r--r-- | src/test_libFLAC/test_libFLAC.vcxproj | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index b1bab029..152b8cbe 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -26,16 +26,12 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$( noinst_PROGRAMS = test_libFLAC -if OS_IS_WINDOWS -win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la -endif - test_libFLAC_LDADD = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \ $(top_builddir)/src/test_libs_common/libtest_libs_common.la \ - $(top_builddir)/src/libFLAC/libFLAC-static.la \ - $(win_utf8_lib) @OGG_LIBS@ \ + $(top_builddir)/src/libFLAC/libFLAC.la \ + @OGG_LIBS@ \ -lm test_libFLAC_SOURCES = \ diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite index e95beb3b..2e1f816c 100644 --- a/src/test_libFLAC/Makefile.lite +++ b/src/test_libFLAC/Makefile.lite @@ -32,12 +32,8 @@ INCLUDES = -I../libFLAC/include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm else -ifeq ($(findstring Windows,$(OS)),Windows) - LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm -else LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC $(OGG_LIBS) -lm endif -endif SRCS_C = \ bitwriter.c \ diff --git a/src/test_libFLAC/test_libFLAC.vcxproj b/src/test_libFLAC/test_libFLAC.vcxproj index 31517695..052c9d99 100644 --- a/src/test_libFLAC/test_libFLAC.vcxproj +++ b/src/test_libFLAC/test_libFLAC.vcxproj @@ -194,10 +194,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>
<ProjectReference Include="..\test_libs_common\test_libs_common_static.vcxproj">
<Project>{4cefbc8e-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|