claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Second patch from X-Fixer: tweaks for better MSVC build

Browse Source
This commit is contained in:
Josh Coalson
2003-01-14 09:05:41 +00:00
parent 4563fa26a1
commit 8dea208c85
22 changed files with 63 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libFLAC/libFLAC_dynamic.dsp
View File

@@ -381,7 +381,7 @@ SOURCE=..\..\include\FLAC\ordinals.h.in
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputDir=..\..\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -393,7 +393,7 @@ InputPath=..\..\include\FLAC\ordinals.h.in
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputDir=..\..\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

12
src/libFLAC/libFLAC_static.dsp
View File

@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\release\lib/libFLAC_static.lib"
# ADD LIB32 /nologo /nodefaultlib
!ELSEIF "$(CFG)" == "libFLAC_static - Win32 Debug"
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.0.5_beta2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nodefaultlib /nologo /out:"..\..\obj\debug\lib/libFLAC_static.lib"
# ADD LIB32 /nologo /nodefaultlib
!ENDIF
@@ -374,7 +374,7 @@ SOURCE=..\..\include\FLAC\ordinals.h.in
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputDir=..\..\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -386,7 +386,7 @@ InputPath=..\..\include\FLAC\ordinals.h.in
USERDEP__ORDIN="..\..\include\FLAC\ordinals.h.in"
# Begin Custom Build
InputDir=\home\Administrator\msvc\flac\include\FLAC
InputDir=..\..\include\FLAC
InputPath=..\..\include\FLAC\ordinals.h.in
"$(InputDir)\ordinals.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

20
src/libFLAC/metadata_iterators.c
View File

@@ -17,10 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
#include <errno.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -322,21 +319,16 @@ static FLAC__bool simple_iterator_prime_input_(FLAC__Metadata_SimpleIterator *it
if(read_only || 0 == (iterator->file = fopen(iterator->filename, "r+b"))) {
iterator->is_writable = false;
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
if(read_only || errno == EACCES) {
#endif
if(0 == (iterator->file = fopen(iterator->filename, "rb"))) {
iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE;
return false;
}
#if !defined _MSC_VER && !defined __MINGW32__
}
else {
iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE;
return false;
}
#endif
}
else {
iterator->is_writable = true;
@@ -2197,17 +2189,11 @@ unsigned seek_to_first_metadata_block_(FILE *f)
FLAC__ASSERT(FLAC__STREAM_SYNC_LENGTH == 4);
/* skip any id3v2 tag */
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
errno = 0;
#endif
n = fread(buffer, 1, 4, f);
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
if(errno)
return 1;
else
#endif
if(n != 4)
return 2;
else if(0 == memcmp(buffer, "ID3", 3)) {
@@ -2230,17 +2216,11 @@ unsigned seek_to_first_metadata_block_(FILE *f)
return 1;
/* read the stream sync code */
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
errno = 0;
#endif
n = fread(buffer, 1, 4, f);
#if !defined _MSC_VER && !defined __MINGW32__
/*@@@ don't know how to resolve errno without using LIBC.LIB; must use MSVCRT.LIB only for plugins */
if(errno)
return 1;
else
#endif
if(n != 4)
return 2;
}