diff options
author | lvqcl <lvqcl.mail@gmail.com> | 2018-08-25 16:59:21 +0300 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2018-08-26 07:58:50 +1000 |
commit | 0897458f59cd894f9bf1103e3a038deda44174b7 (patch) | |
tree | dab5ede99587b2394ff992d15c857140c4d9474c | |
parent | edfbe3cf194768af2f4c3cfd5cb5a6a273f63964 (diff) | |
download | flac-0897458f59cd894f9bf1103e3a038deda44174b7.tar.gz |
Update MinGW build files
-rw-r--r-- | src/test_grabbag/picture/Makefile.am | 7 | ||||
-rw-r--r-- | src/test_grabbag/picture/Makefile.lite | 4 | ||||
-rw-r--r-- | src/test_libFLAC++/Makefile.am | 6 | ||||
-rw-r--r-- | src/test_libFLAC++/Makefile.lite | 4 | ||||
-rw-r--r-- | src/test_libFLAC/Makefile.am | 5 | ||||
-rw-r--r-- | src/test_libFLAC/Makefile.lite | 4 |
6 files changed, 29 insertions, 1 deletions
diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am index 0ee04a41..394b6eb0 100644 --- a/src/test_grabbag/picture/Makefile.am +++ b/src/test_grabbag/picture/Makefile.am @@ -27,9 +27,14 @@ check_PROGRAMS = test_picture test_picture_SOURCES = \ main.c +if OS_IS_WINDOWS +win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la +endif + 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 + $(top_builddir)/src/libFLAC/libFLAC.la \ + $(win_utf8_lib) CLEANFILES = test_picture.exe diff --git a/src/test_grabbag/picture/Makefile.lite b/src/test_grabbag/picture/Makefile.lite index 91c03dae..2844923e 100644 --- a/src/test_grabbag/picture/Makefile.lite +++ b/src/test_grabbag/picture/Makefile.lite @@ -32,8 +32,12 @@ 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_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index 31830b29..e4b0f76c 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -24,12 +24,18 @@ EXTRA_DIST = \ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include check_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++.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ + $(win_utf8_lib) \ @OGG_LIBS@ \ -lm diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite index 2c0488d9..dd67788d 100644 --- a/src/test_libFLAC++/Makefile.lite +++ b/src/test_libFLAC++/Makefile.lite @@ -32,8 +32,12 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm +else LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_CPP = \ decoders.cpp \ diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 3e37f200..44823fbc 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -26,11 +26,16 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$( check_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@ \ -lm diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite index 47aff235..a9c9ac13 100644 --- a/src/test_libFLAC/Makefile.lite +++ b/src/test_libFLAC/Makefile.lite @@ -32,8 +32,12 @@ 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 = \ bitreader.c \ |