[cvs-annodex] commit (libfishsound): trunk/Makefile.am trunk/src/libfishsound/fs_compat.h trunk/win32/Makefile trunk/win32/decode.dsp trunk/win32/encode.dsp trunk/win32/identify.dsp trunk/win32/libfishsound.dsp trunk/win32/libfishsound.dsw trunk/win32/libfishsound/libfishsound.def +trunk/win32/info.dsp

silvia nobody at lists.annodex.net
Tue May 18 12:44:34 EST 2004


Update of /annodex/libfishsound (new revision 80)

Added files:
   trunk/win32/info.dsp

Modified files:
   trunk/Makefile.am
   trunk/src/libfishsound/fs_compat.h
   trunk/win32/Makefile
   trunk/win32/decode.dsp
   trunk/win32/encode.dsp
   trunk/win32/identify.dsp
   trunk/win32/libfishsound.dsp
   trunk/win32/libfishsound.dsw
   trunk/win32/libfishsound/libfishsound.def

Log Message:
Windows port for nmake and Visual Studio Version 6.
 
The .NET stuff isn't ported/checked yet -> requires to add fishsound-info.
  


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/Makefile.am	2004-05-18 02:44:34 UTC (rev 80)
@@ -39,6 +39,7 @@
 	win32/identify.dsp \
 	win32/decode.dsp \
 	win32/encode.dsp \
+	win32/info.dsp \
 	win32/libfishsound/libfishsound.sln \
 	win32/libfishsound/libfishsound.vcproj
 

Modified: trunk/src/libfishsound/fs_compat.h
===================================================================
--- trunk/src/libfishsound/fs_compat.h	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/src/libfishsound/fs_compat.h	2004-05-18 02:44:34 UTC (rev 80)
@@ -37,5 +37,7 @@
 #define inline __inline
 #define alloca _alloca
 #define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#define snprintf _snprintf
 #endif
  

Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/Makefile	2004-05-18 02:44:34 UTC (rev 80)
@@ -21,7 +21,7 @@
 #====================================================================
 # Targets
 
-ALL :  "libfishsound.dll" "identify.exe" "encode.exe" "decode.exe"
+ALL :  "libfishsound.dll" "fishsound-identify.exe" "fishsound-info.exe" "fishsound-encode.exe" "fishsound-decode.exe"
 
 CLEAN:
 	- at erase ".\*.obj"
@@ -34,37 +34,49 @@
 
 LINK32_OBJS= \
 	".\fishsound.obj" \
+	".\comments.obj" \
 	".\speex.obj" \
-	".\vorbis.obj"
+	".\vorbis.obj" \
+	".\fs_vector.obj"
 
 "libfishsound.dll" : $(LINK32_OBJS) ".\libfishsound\libfishsound.def"
     $(LINK32) $(LINK32_FLAGS) /def:".\libfishsound\libfishsound.def" $(LINK32_OBJS)
 
-"identify.exe" : "..\src\examples\identify.c"
-	$(CPP) $(CFLAGS) /Fo".\identify.obj" /c "..\src\examples\identify.c"
-	$(LINK32) $(PROG_LINK_FLAGS) /out:"identify.exe" ".\identify.obj" liboggz.lib libfishsound.lib
+"fishsound-identify.exe" : "..\src\examples\fishsound-identify.c"
+	$(CPP) $(CFLAGS) /Fo".\fishsound-identify.obj" /c "..\src\examples\fishsound-identify.c"
+	$(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-identify.exe" ".\fishsound-identify.obj" liboggz.lib libfishsound.lib
 
-"encode.exe" : "..\src\examples\encode.c"
-	$(CPP) $(CFLAGS) /Fo".\encode.obj" /c "..\src\examples\encode.c"
-	$(LINK32) $(PROG_LINK_FLAGS) /out:"encode.exe" ".\encode.obj" liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib
+"fishsound-info.exe" : "..\src\examples\fishsound-info.c"
+	$(CPP) $(CFLAGS) /Fo".\fishsound-info.obj" /c "..\src\examples\fishsound-info.c"
+	$(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-info.exe" ".\fishsound-info.obj" liboggz.lib libfishsound.lib
 
-"decode.exe" : "..\src\examples\decode.c"
-	$(CPP) $(CFLAGS) /Fo".\decode.obj" /c "..\src\examples\decode.c"
-	$(LINK32) $(PROG_LINK_FLAGS) /out:"decode.exe" ".\decode.obj" liboggz.lib libfishsound.lib libspeex.lib vorbis.lib libsndfile.lib
+"fishsound-encode.exe" : "..\src\examples\fishsound-encode.c"
+	$(CPP) $(CFLAGS) /Fo".\fishsound-encode.obj" /c "..\src\examples\fishsound-encode.c"
+	$(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-encode.exe" ".\fishsound-encode.obj" liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib
 
+"fishsound-decode.exe" : "..\src\examples\fishsound-decode.c"
+	$(CPP) $(CFLAGS) /Fo".\fishsound-decode.obj" /c "..\src\examples\fishsound-decode.c"
+	$(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-decode.exe" ".\fishsound-decode.obj" liboggz.lib libfishsound.lib libspeex.lib vorbis.lib libsndfile.lib
 
+
 #====================================================================
 # C files in src
 
 .\fishsound.obj:
 	$(CPP) $(CFLAGS) /Fo".\fishsound.obj" /c "..\src\libfishsound\fishsound.c"
 
+.\comments.obj:
+	$(CPP) $(CFLAGS) /Fo".\comments.obj" /c "..\src\libfishsound\comments.c"
+
 .\speex.obj:
 	$(CPP) $(CFLAGS) /Fo".\speex.obj" /c "..\src\libfishsound\speex.c"
 
 .\vorbis.obj:
 	$(CPP) $(CFLAGS) /Fo".\vorbis.obj" /c "..\src\libfishsound\vorbis.c"
 
+.\fs_vector.obj:
+	$(CPP) $(CFLAGS) /Fo".\fs_vector.obj" /c "..\src\libfishsound\fs_vector.c"
+
 # End of Makefile
 #====================================================================
 

Modified: trunk/win32/decode.dsp
===================================================================
--- trunk/win32/decode.dsp	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/decode.dsp	2004-05-18 02:44:34 UTC (rev 80)
@@ -42,7 +42,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Ze /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-decode.exe" /libpath:".\\"
 
 !ELSEIF  "$(CFG)" == "decode - Win32 Debug"
 
@@ -67,7 +67,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Ze /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -76,7 +76,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-decode.exe" /pdbtype:sept /libpath:".\\"
 
 !ENDIF 
 
@@ -89,7 +89,7 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\src\examples\decode.c
+SOURCE="..\src\examples\fishsound-decode.c"
 # End Source File
 # End Group
 # Begin Group "Header Files"

Modified: trunk/win32/encode.dsp
===================================================================
--- trunk/win32/encode.dsp	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/encode.dsp	2004-05-18 02:44:34 UTC (rev 80)
@@ -51,7 +51,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-encode.exe" /libpath:".\\"
 
 !ELSEIF  "$(CFG)" == "encode - Win32 Debug"
 
@@ -76,7 +76,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-encode.exe" /pdbtype:sept /libpath:".\\"
 
 !ENDIF 
 
@@ -89,7 +89,7 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\src\examples\encode.c
+SOURCE="..\src\examples\fishsound-encode.c"
 # End Source File
 # End Group
 # Begin Group "Header Files"

Modified: trunk/win32/identify.dsp
===================================================================
--- trunk/win32/identify.dsp	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/identify.dsp	2004-05-18 02:44:34 UTC (rev 80)
@@ -42,7 +42,8 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Ze /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +51,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libspeex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 libspeex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-identify.exe" /libpath:".\\"
 
 !ELSEIF  "$(CFG)" == "identify - Win32 Debug"
 
@@ -66,7 +67,8 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Ze /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -74,7 +76,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-identify.exe" /pdbtype:sept /libpath:".\\"
 
 !ENDIF 
 
@@ -87,7 +89,7 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\src\examples\identify.c
+SOURCE="..\src\examples\fishsound-identify.c"
 # End Source File
 # End Group
 # Begin Group "Header Files"

Added: trunk/win32/info.dsp
===================================================================
--- trunk/win32/info.dsp	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/info.dsp	2004-05-18 02:44:34 UTC (rev 80)
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="info" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=info - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "info.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "info.mak" CFG="info - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "info - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "info - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "info - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-info.exe" /libpath:".\\"
+
+!ELSEIF  "$(CFG)" == "info - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ  /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-info.exe" /pdbtype:sept /libpath:".\\"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "info - Win32 Release"
+# Name "info - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\src\examples\fishsound-info.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project


Property changes on: trunk/win32/info.dsp
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/win32/libfishsound/libfishsound.def
===================================================================
--- trunk/win32/libfishsound/libfishsound.def	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/libfishsound/libfishsound.def	2004-05-18 02:44:34 UTC (rev 80)
@@ -15,7 +15,7 @@
 		fish_sound_get_frameno
 		fish_sound_set_frameno
 		fish_sound_prepare_truncation
-		fish_sound_get_vendor
+		fish_sound_comment_get_vendor
 		fish_sound_comment_first
 		fish_sound_comment_next
 		fish_sound_comment_first_byname

Modified: trunk/win32/libfishsound.dsp
===================================================================
--- trunk/win32/libfishsound.dsp	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/libfishsound.dsp	2004-05-18 02:44:34 UTC (rev 80)
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /Ze /W3 /Gi- /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -71,7 +71,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Ze /W3 /Gm /Gi- /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -96,10 +96,18 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\src\libfishsound\comments.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\libfishsound\fishsound.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\libfishsound\fs_vector.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\libfishsound\libfishsound.def
 # End Source File
 # Begin Source File
@@ -128,6 +136,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\libfishsound\fs_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\libfishsound\fs_vector.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\libfishsound\private.h
 # End Source File
 # End Group

Modified: trunk/win32/libfishsound.dsw
===================================================================
--- trunk/win32/libfishsound.dsw	2004-05-18 01:34:42 UTC (rev 79)
+++ trunk/win32/libfishsound.dsw	2004-05-18 02:44:34 UTC (rev 80)
@@ -48,6 +48,18 @@
 
 ###############################################################################
 
+Project: "info"=.\info.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libfishsound"=.\libfishsound.dsp - Package Owner=<4>
 
 Package=<5>
@@ -56,6 +68,9 @@
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name info
+    End Project Dependency
 }}}
 
 ###############################################################################


-- 
silvia



More information about the cvs-annodex mailing list