mirrors/flac
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libFLAC: Remove win_utf8_io dependency

Browse Source 
Path-from: lvqcl <lvqcl.mail@gmail.com>
This commit is contained in:
Erik de Castro Lopo 2016-02-05 11:02:44 +11:00
parent a5c8e8e14d
commit d40a6bc695
51 changed files with 196 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
FLAC-vs2005.sln
View File

@ -4,27 +4,23 @@ Microsoft Visual Studio Solution File, Format Version 9.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_decode_file", "examples\c\decode\file\example_c_decode_file.vcproj", "{4CEFBD00-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_encode_file", "examples\c\encode\file\example_c_encode_file.vcproj", "{4CEFBD01-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_decode_file", "examples\cpp\decode\file\example_cpp_decode_file.vcproj", "{4CEFBE00-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_encode_file", "examples\cpp\encode\file\example_cpp_encode_file.vcproj", "{4CEFBE01-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flac", "src\flac\flac.vcproj", "{4CEFBC7D-C215-11DB-8314-0800200C9A66}"
@ -59,29 +55,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grabbag_static", "src\share
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC89-C215-11DB-8314-0800200C9A66} = {4CEFBC89-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "src\libFLAC\libFLAC_dynamic.vcproj", "{4CEFBC83-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_static", "src\libFLAC\libFLAC_static.vcproj", "{4CEFBC84-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_dynamic", "src\libFLAC++\libFLAC++_dynamic.vcproj", "{4CEFBC85-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_static", "src\libFLAC++\libFLAC++_static.vcproj", "{4CEFBC86-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metaflac", "src\metaflac\metaflac.vcproj", "{4CEFBC87-C215-11DB-8314-0800200C9A66}"
@ -102,7 +89,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cuesheet", "src\test_g
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC", "src\test_libFLAC\test_libFLAC.vcproj", "{4CEFBC8C-C215-11DB-8314-0800200C9A66}"
@ -110,7 +96,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC", "src\test_li
{4CEFBC8E-C215-11DB-8314-0800200C9A66} = {4CEFBC8E-C215-11DB-8314-0800200C9A66}
{4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66}
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC++", "src\test_libFLAC++\test_libFLAC++.vcproj", "{4CEFBC8D-C215-11DB-8314-0800200C9A66}"
@ -119,26 +104,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC++", "src\test_
{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
{4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66}
{4CEFBC8E-C215-11DB-8314-0800200C9A66} = {4CEFBC8E-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libs_common_static", "src\test_libs_common\test_libs_common_static.vcproj", "{4CEFBC8E-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_picture", "src\test_grabbag\picture\test_picture.vcproj", "{4CEFBC8F-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_seeking", "src\test_seeking\test_seeking.vcproj", "{4CEFBC90-C215-11DB-8314-0800200C9A66}"
ProjectSection(ProjectDependencies) = postProject
{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_streams", "src\test_streams\test_streams.vcproj", "{4CEFBC91-C215-11DB-8314-0800200C9A66}"

15
Makefile.deps
View File

@ -17,15 +17,14 @@
# distribution.
ifeq ($(findstring Windows,$(OS)),Windows) # "Windows" is provided by GNU Make's internal $(OS)
LIBFLAC_DEPS = share/win_utf8_io
WIN_DEPS = share/win_utf8_io
else
LIBFLAC_DEPS =
WIN_DEPS =
endif
libFLAC: $(LIBFLAC_DEPS)
flac: libFLAC share
flac: libFLAC share $(WIN_DEPS)
libFLAC++: libFLAC
metaflac: libFLAC share
metaflac: libFLAC share $(WIN_DEPS)
plugin_common: libFLAC
plugin_xmms: libFLAC plugin_common
share: libFLAC
@ -34,7 +33,7 @@ test_libs_common: libFLAC
test_libFLAC++: libFLAC libFLAC++ test_libs_common
test_libFLAC: libFLAC test_libs_common
test_seeking: libFLAC
test_streams: libFLAC
flacdiff: libFLAC libFLAC++
flactimer: libFLAC libFLAC++
test_streams: share
flacdiff: libFLAC libFLAC++ $(WIN_DEPS)
flactimer:
utils: flacdiff flactimer

4
Makefile.lite
View File

@ -31,7 +31,7 @@
topdir = .
.PHONY: all doc src examples libFLAC libFLAC++ share/win_utf8_io share plugin_common flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams flacdiff flactimer
.PHONY: all doc src examples libFLAC libFLAC++ share plugin_common flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams flacdiff flactimer
all: src examples
DEFAULT_CONFIG = release
@ -52,7 +52,7 @@ doc:
src examples:
(cd $@ && $(MAKE) -f Makefile.lite $(CONFIG))
libFLAC libFLAC++ share/win_utf8_io share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++:
libFLAC libFLAC++ share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++:
(cd src/$@ && $(MAKE) -f Makefile.lite $(CONFIG))
flacdiff flactimer:

4
examples/c/decode/file/Makefile.lite
View File

@ -31,13 +31,9 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = main.c

4
examples/c/decode/file/example_c_decode_file.vcxproj
View File

@ -172,10 +172,6 @@
<Project>{4cefbc84-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\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">

4
examples/c/encode/file/Makefile.lite
View File

@ -31,13 +31,9 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = main.c

4
examples/c/encode/file/example_c_encode_file.vcxproj
View File

@ -172,10 +172,6 @@
<Project>{4cefbc84-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\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">

4
examples/cpp/decode/file/Makefile.lite
View File

@ -31,13 +31,9 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_CPP = main.cpp

4
examples/cpp/decode/file/example_cpp_decode_file.vcxproj
View File

@ -176,10 +176,6 @@
<Project>{4cefbc84-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\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">

4
examples/cpp/encode/file/Makefile.lite
View File

@ -31,13 +31,9 @@ INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_CPP = main.cpp

4
examples/cpp/encode/file/example_cpp_encode_file.vcxproj
View File

@ -176,10 +176,6 @@
<Project>{4cefbc84-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\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">

3
include/share/Makefile.am
View File

@ -14,4 +14,5 @@ EXTRA_DIST = \
replaygain_synthesis.h \
safe_str.h \
utf8.h \
win_utf8_io.h
win_utf8_io.h \
windows_unicode_filenames.h

15
include/share/compat.h
View File

@ -146,18 +146,19 @@
#ifdef _WIN32
/* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */
#include "share/win_utf8_io.h"
#include "share/win_utf8_io.h"
#define flac_printf printf_utf8
#define flac_fprintf fprintf_utf8
#define flac_vfprintf vfprintf_utf8
#define flac_fopen fopen_utf8
#define flac_chmod chmod_utf8
#define flac_utime utime_utf8
#define flac_unlink unlink_utf8
#define flac_rename rename_utf8
#define flac_stat _stat64_utf8
#include "share/windows_unicode_filenames.h"
#define flac_fopen flac_internal_fopen_utf8
#define flac_chmod flac_internal_chmod_utf8
#define flac_utime flac_internal_utime_utf8
#define flac_unlink flac_internal_unlink_utf8
#define flac_rename flac_internal_rename_utf8
#define flac_stat flac_internal_stat64_utf8
#else

8
include/share/win_utf8_io.h
View File

@ -34,15 +34,13 @@
#ifndef flac__win_utf8_io_h
#define flac__win_utf8_io_h
#include <stdio.h>
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <stdio.h>
#include <sys/stat.h>
#include <stdarg.h>
#include <windows.h>
size_t strlen_utf8(const char *str);
int win_get_console_width(void);

2
src/Makefile.am
View File

@ -25,8 +25,8 @@ CPPLIBS_DIRS = libFLAC++ test_libFLAC++
endif
SUBDIRS = \
share \
libFLAC \
share \
flac \
metaflac \
$(XMMS_DIRS) \

5
src/flac/Makefile.am
View File

@ -48,6 +48,10 @@ flac_SOURCES = \
utils.h \
vorbiscomment.h
if OS_IS_WINDOWS
win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
endif
flac_LDADD = \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
@ -55,6 +59,7 @@ flac_LDADD = \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
$(win_utf8_lib) \
@LIBICONV@ \
-lm

4
src/libFLAC++/Makefile.lite
View File

@ -43,16 +43,12 @@ endif
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm -lsupc++
else
ifeq ($(OS),FreeBSD)
LIBS = -lFLAC $(OGG_LIBS) -lm -lstdc++
else
LIBS = -lFLAC $(OGG_LIBS) -lm -lsupc++
endif
endif
endif
LIB_NAME = libFLAC++
INCLUDES = -I$(topdir)/include

4
src/libFLAC++/libFLAC++_dynamic.vcxproj
View File

@ -173,10 +173,6 @@
<Project>{4cefbc83-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">

4
src/libFLAC++/libFLAC++_static.vcxproj
View File

@ -141,10 +141,6 @@
<Project>{4cefbc84-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">

11
src/libFLAC/Makefile.am
View File

@ -61,11 +61,7 @@ endif
endif
endif
if OS_IS_WINDOWS
win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
endif
libFLAC_la_LIBADD = $(win_utf8_lib) $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm
SUBDIRS = $(ARCH_SUBDIRS) include .
@ -86,6 +82,10 @@ EXTRA_DIST = \
libFLAC_static.vcxproj.filters \
libFLAC.m4
if OS_IS_WINDOWS
windows_unicode_compat = windows_unicode_filenames.c
endif
if FLaC__HAS_OGG
extra_ogg_sources = \
ogg_decoder_aspect.c \
@ -124,6 +124,7 @@ libFLAC_sources = \
stream_encoder_intrin_avx2.c \
stream_encoder_framing.c \
window.c \
$(windows_unicode_compat) \
$(extra_ogg_sources)
libFLAC_la_SOURCES = $(libFLAC_sources)

7
src/libFLAC/Makefile.lite
View File

@ -37,12 +37,12 @@ topdir = ../..
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = $(OGG_LIBS) -lm
endif
ifeq ($(findstring Windows,$(OS)),Windows)
WIN_UNICODE_COMPAT = windows_unicode_filenames.c
endif
LIB_NAME = libFLAC
@ -102,6 +102,7 @@ SRCS_C = \
stream_encoder_intrin_avx2.c \
stream_encoder_framing.c \
window.c \
$(WIN_UNICODE_COMPAT) \
$(OGG_SRCS)
include $(topdir)/build/lib.mk

40
src/libFLAC/libFLAC_dynamic.vcproj
View File

@ -186,11 +186,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\include\private\all.h"
RelativePath=".\include\protected\all.h"
>
</File>
<File
RelativePath=".\include\protected\all.h"
RelativePath=".\include\private\all.h"
>
</File>
<File
@ -266,11 +266,11 @@
>
</File>
<File
RelativePath=".\include\protected\stream_encoder.h"
RelativePath=".\include\private\stream_encoder.h"
>
</File>
<File
RelativePath=".\include\private\stream_encoder.h"
RelativePath=".\include\protected\stream_encoder.h"
>
</File>
<File
@ -399,6 +399,10 @@
RelativePath=".\window.c"
>
</File>
<File
RelativePath=".\windows_unicode_filenames.c"
>
</File>
</Filter>
<Filter
Name="Public Header Files"
@ -407,6 +411,10 @@
RelativePath="..\..\include\FLAC\all.h"
>
</File>
<File
RelativePath="..\..\include\share\alloc.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\assert.h"
>
@ -415,6 +423,14 @@
RelativePath="..\..\include\FLAC\callback.h"
>
</File>
<File
RelativePath="..\..\include\share\compat.h"
>
</File>
<File
RelativePath="..\..\include\share\endswap.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\export.h"
>
@ -423,6 +439,10 @@
RelativePath="..\..\include\FLAC\format.h"
>
</File>
<File
RelativePath="..\..\include\share\macros.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\metadata.h"
>
@ -431,6 +451,14 @@
RelativePath="..\..\include\FLAC\ordinals.h"
>
</File>
<File
RelativePath="..\..\include\share\private.h"
>
</File>
<File
RelativePath="..\..\include\share\safe_str.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\stream_decoder.h"
>
@ -439,6 +467,10 @@
RelativePath="..\..\include\FLAC\stream_encoder.h"
>
</File>
<File
RelativePath="..\..\include\share\windows_unicode_filenames.h"
>
</File>
</Filter>
<File
RelativePath=".\ia32\cpu_asm.nasm"

14
src/libFLAC/libFLAC_dynamic.vcxproj
View File

@ -184,6 +184,13 @@
<ClInclude Include="..\..\include\FLAC\ordinals.h" />
<ClInclude Include="..\..\include\FLAC\stream_decoder.h" />
<ClInclude Include="..\..\include\FLAC\stream_encoder.h" />
<ClInclude Include="..\..\include\share\alloc.h" />
<ClInclude Include="..\..\include\share\compat.h" />
<ClInclude Include="..\..\include\share\endswap.h" />
<ClInclude Include="..\..\include\share\macros.h" />
<ClInclude Include="..\..\include\share\private.h" />
<ClInclude Include="..\..\include\share\safe_str.h" />
<ClInclude Include="..\..\include\share\windows_unicode_filenames.h" />
<ClInclude Include="ia32\nasm.h" />
<ClInclude Include="include\private\all.h" />
<ClInclude Include="include\private\bitmath.h" />
@ -250,6 +257,7 @@
<ClCompile Include="stream_encoder_intrin_sse2.c" />
<ClCompile Include="stream_encoder_intrin_ssse3.c" />
<ClCompile Include="window.c" />
<ClCompile Include="windows_unicode_filenames.c" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="ia32\cpu_asm.nasm">
@ -313,12 +321,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<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">
</ImportGroup>

24
src/libFLAC/libFLAC_dynamic.vcxproj.filters
View File

@ -113,6 +113,27 @@
<ClInclude Include="..\..\include\FLAC\stream_encoder.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\alloc.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\compat.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\endswap.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\macros.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\private.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\safe_str.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\windows_unicode_filenames.h">
<Filter>Public Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="bitmath.c">
@ -205,6 +226,9 @@
<ClCompile Include="window.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="windows_unicode_filenames.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="ia32\cpu_asm.nasm" />

40
src/libFLAC/libFLAC_static.vcproj
View File

@ -159,11 +159,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
@ -239,11 +239,11 @@
>
</File>
<File
RelativePath=".\include\protected\stream_encoder.h"
RelativePath=".\include\private\stream_encoder.h"
>
</File>
<File
RelativePath=".\include\private\stream_encoder.h"
RelativePath=".\include\protected\stream_encoder.h"
>
</File>
<File
@ -262,6 +262,10 @@
RelativePath="..\..\include\FLAC\all.h"
>
</File>
<File
RelativePath="..\..\include\share\alloc.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\assert.h"
>
@ -270,6 +274,14 @@
RelativePath="..\..\include\FLAC\callback.h"
>
</File>
<File
RelativePath="..\..\include\share\compat.h"
>
</File>
<File
RelativePath="..\..\include\share\endswap.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\export.h"
>
@ -278,6 +290,10 @@
RelativePath="..\..\include\FLAC\format.h"
>
</File>
<File
RelativePath="..\..\include\share\macros.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\metadata.h"
>
@ -286,6 +302,14 @@
RelativePath="..\..\include\FLAC\ordinals.h"
>
</File>
<File
RelativePath="..\..\include\share\private.h"
>
</File>
<File
RelativePath="..\..\include\share\safe_str.h"
>
</File>
<File
RelativePath="..\..\include\FLAC\stream_decoder.h"
>
@ -294,6 +318,10 @@
RelativePath="..\..\include\FLAC\stream_encoder.h"
>
</File>
<File
RelativePath="..\..\include\share\windows_unicode_filenames.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
@ -412,6 +440,10 @@
RelativePath=".\window.c"
>
</File>
<File
RelativePath=".\windows_unicode_filenames.c"
>
</File>
</Filter>
<File
RelativePath=".\ia32\cpu_asm.nasm"

13
src/libFLAC/libFLAC_static.vcxproj
View File

@ -144,6 +144,13 @@
<ClInclude Include="..\..\include\FLAC\ordinals.h" />
<ClInclude Include="..\..\include\FLAC\stream_decoder.h" />
<ClInclude Include="..\..\include\FLAC\stream_encoder.h" />
<ClInclude Include="..\..\include\share\alloc.h" />
<ClInclude Include="..\..\include\share\compat.h" />
<ClInclude Include="..\..\include\share\endswap.h" />
<ClInclude Include="..\..\include\share\macros.h" />
<ClInclude Include="..\..\include\share\private.h" />
<ClInclude Include="..\..\include\share\safe_str.h" />
<ClInclude Include="..\..\include\share\windows_unicode_filenames.h" />
<ClInclude Include="ia32\nasm.h" />
<ClInclude Include="include\private\all.h" />
<ClInclude Include="include\private\bitmath.h" />
@ -210,6 +217,7 @@
<ClCompile Include="stream_encoder_intrin_sse2.c" />
<ClCompile Include="stream_encoder_intrin_ssse3.c" />
<ClCompile Include="window.c" />
<ClCompile Include="windows_unicode_filenames.c" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="ia32\cpu_asm.nasm">
@ -273,11 +281,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\share\win_utf8_io\win_utf8_io_static.vcxproj">
<Project>{4cefbe02-c215-11db-8314-0800200c9a66}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

24
src/libFLAC/libFLAC_static.vcxproj.filters
View File

@ -113,6 +113,27 @@
<ClInclude Include="..\..\include\FLAC\stream_encoder.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\alloc.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\compat.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\endswap.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\macros.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\private.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\safe_str.h">
<Filter>Public Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\share\windows_unicode_filenames.h">
<Filter>Public Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="bitmath.c">
@ -205,6 +226,9 @@
<ClCompile Include="window.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="windows_unicode_filenames.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="ia32\cpu_asm.nasm" />

5
src/metaflac/Makefile.am
View File

@ -44,12 +44,17 @@ metaflac_SOURCES = \
utils.h
metaflac_LDFLAGS = $(AM_LDFLAGS)
if OS_IS_WINDOWS
win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
endif
metaflac_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/share/getopt/libgetopt.la \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
$(win_utf8_lib) \
@LIBICONV@
CLEANFILES = metaflac.exe

4
src/plugin_common/Makefile.lite
View File

@ -27,13 +27,9 @@ INCLUDES = -I$(topdir)/include -I$(HOME)/local/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 = \
charset.c \

4
src/plugin_xmms/Makefile.lite
View File

@ -28,13 +28,9 @@ INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)
# refer to the static libs explicitly
ifeq ($(OS),Darwin)
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm -lstdc++ -lz
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libwin_utf8_io.a $(OGG_LIBS) -lm -lsupc++ -lz
else
LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_LIBS) -lm -lsupc++ -lz
endif
endif
SRCS_C = \
charset.c \

2
src/share/Makefile.am
View File

@ -63,12 +63,12 @@ noinst_LTLIBRARIES = \
if OS_IS_WINDOWS
win_utf8_io_libwin_utf8_io_la_SOURCES = win_utf8_io/win_utf8_io.c
libwin_utf8_io = win_utf8_io/libwin_utf8_io.la
win_utf8_io_libwin_utf8_io_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
else
win_utf8_io_libwin_utf8_io_la_SOURCES =
libwin_utf8_io =
endif
getopt_libgetopt_la_SOURCES = getopt/getopt.c getopt/getopt1.c
grabbag_libgrabbag_la_SOURCES = \

6
src/share/grabbag/Makefile.lite
View File

@ -1,3 +1,5 @@
# grabbag - Convenience lib for various routines common to several tools
#
# GNU makefile
#
@ -7,13 +9,9 @@ libdir = $(topdir)/objs/$(BUILD)/lib
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lreplaygain_analysis -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC -lreplaygain_analysis $(OGG_LIBS) -lm
endif
endif
LIB_NAME = libgrabbag
INCLUDES = -I$(topdir)/include

4
src/share/grabbag/grabbag_static.vcxproj
View File

@ -154,10 +154,6 @@
<Project>{4cefbc89-c215-11db-8314-0800200c9a66}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\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">

6
src/share/win_utf8_io/Makefile.lite
View File

@ -4,6 +4,12 @@
topdir = ../../..
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
LIB_NAME = libwin_utf8_io
INCLUDES = -I$(topdir)/include

141
src/share/win_utf8_io/win_utf8_io.c
View File

@ -103,8 +103,6 @@ static wchar_t *wchar_from_utf8(const char *str)
return widestr;
}
static void set_filename_utf8(int b);
/* retrieve WCHAR commandline, expand wildcards and convert everything to UTF-8 */
int get_utf8_argv(int *argc, char ***argv)
{
@ -144,7 +142,7 @@ int get_utf8_argv(int *argc, char ***argv)
FreeLibrary(handle); /* do not free it when wargv or wenv are still in use */
if (ret == 0) {
set_filename_utf8(1);
flac_set_utf8_filenames(true);
*argc = wargc;
*argv = utf8argv;
} else {
@ -258,140 +256,3 @@ int vfprintf_utf8(FILE *stream, const char *format, va_list argptr)
return ret;
}
/* file functions */
static int utf8_filename = 0;
static void set_filename_utf8(int b)
{
utf8_filename = b ? 1: 0;
}
FILE *fopen_utf8(const char *filename, const char *mode)
{
if (0 == utf8_filename) {
return fopen(filename, mode);
} else {
wchar_t *wname = NULL;
wchar_t *wmode = NULL;
FILE *f = NULL;
do {
if (!(wname = wchar_from_utf8(filename))) break;
if (!(wmode = wchar_from_utf8(mode))) break;
f = _wfopen(wname, wmode);
} while(0);
free(wname);
free(wmode);
return f;
}
}
int _stat64_utf8(const char *path, struct __stat64 *buffer)
{
if (0 == utf8_filename) {
return _stat64(path, buffer);
} else {
wchar_t *wpath;
int ret;
if (!(wpath = wchar_from_utf8(path))) return -1;
ret = _wstat64(wpath, buffer);
free(wpath);
return ret;
}
}
int chmod_utf8(const char *filename, int pmode)
{
if (0 == utf8_filename) {
return _chmod(filename, pmode);
} else {
wchar_t *wname;
int ret;
if (!(wname = wchar_from_utf8(filename))) return -1;
ret = _wchmod(wname, pmode);
free(wname);
return ret;
}
}
int utime_utf8(const char *filename, struct utimbuf *times)
{
if (0 == utf8_filename) {
return utime(filename, times);
} else {
wchar_t *wname;
struct __utimbuf64 ut;
int ret;
if (!(wname = wchar_from_utf8(filename))) return -1;
ut.actime = times->actime;
ut.modtime = times->modtime;
ret = _wutime64(wname, &ut);
free(wname);
return ret;
}
}
int unlink_utf8(const char *filename)
{
if (0 == utf8_filename) {
return _unlink(filename);
} else {
wchar_t *wname;
int ret;
if (!(wname = wchar_from_utf8(filename))) return -1;
ret = _wunlink(wname);
free(wname);
return ret;
}
}
int rename_utf8(const char *oldname, const char *newname)
{
if (0 == utf8_filename) {
return rename(oldname, newname);
} else {
wchar_t *wold = NULL;
wchar_t *wnew = NULL;
int ret = -1;
do {
if (!(wold = wchar_from_utf8(oldname))) break;
if (!(wnew = wchar_from_utf8(newname))) break;
ret = _wrename(wold, wnew);
} while(0);
free(wold);
free(wnew);
return ret;
}
}
HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
{
if (0 == utf8_filename) {
return CreateFileA(lpFileName, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
} else {
wchar_t *wname;
HANDLE handle = INVALID_HANDLE_VALUE;
if ((wname = wchar_from_utf8(lpFileName)) != NULL) {
handle = CreateFileW(wname, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
free(wname);
}
return handle;
}
}

4
src/test_grabbag/cuesheet/Makefile.lite
View File

@ -31,13 +31,9 @@ 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

4
src/test_grabbag/cuesheet/test_cuesheet.vcxproj
View File

@ -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">

1
src/test_grabbag/picture/Makefile.am
View File

@ -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

4
src/test_grabbag/picture/Makefile.lite
View File

@ -31,13 +31,9 @@ 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

4
src/test_grabbag/picture/test_picture.vcxproj
View File

@ -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">

4
src/test_libFLAC++/Makefile.lite
View File

@ -31,13 +31,9 @@ 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 \

4
src/test_libFLAC++/test_libFLAC++.vcxproj
View File

@ -185,10 +185,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>

8
src/test_libFLAC/Makefile.am
View File

@ -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 = \

4
src/test_libFLAC/Makefile.lite
View File

@ -31,13 +31,9 @@ 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 \

4
src/test_libFLAC/test_libFLAC.vcxproj
View File

@ -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>

2
src/test_libs_common/Makefile.am
View File

@ -24,6 +24,8 @@ libtest_libs_common_la_SOURCES = \
file_utils_flac.c \
metadata_utils.c
libtest_libs_common_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
EXTRA_DIST = \
Makefile.lite \
README \

4
src/test_libs_common/Makefile.lite
View File

@ -27,13 +27,9 @@ LIB_NAME = libtest_libs_common
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
INCLUDES = -I$(topdir)/include

4
src/test_libs_common/test_libs_common_static.vcxproj
View File

@ -137,10 +137,6 @@
<Project>{4cefbc84-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">

4
src/test_seeking/Makefile.lite
View File

@ -31,13 +31,9 @@ INCLUDES = -I../libFLAC/include -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC $(OGG_LIBS) -lm
endif
endif
SRCS_C = \
main.c

4
src/test_seeking/test_seeking.vcxproj
View File

@ -172,10 +172,6 @@
<Project>{4cefbc84-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">

8
src/utils/flactimer/Makefile.lite
View File

@ -28,13 +28,9 @@ PROGRAM_NAME = flactimer
INCLUDES = -I$(topdir)/include
ifeq ($(OS),Darwin)
EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm
EXPLICIT_LIBS = -lm
else
ifeq ($(findstring Windows,$(OS)),Windows)
LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm
else
LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm
endif
LIBS = -lm
endif
SRCS_CPP = \