Commit 551e0648 authored by Jack Moffitt's avatar Jack Moffitt

win32 build fixes, including ingo's suggestions

svn path=/trunk/vorbis/; revision=1504
parent 02298a3f
@echo off
echo ---+++--- Building Vorbis (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbis (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbis (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbis (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisenc (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisenc (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisenc (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisenc (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisfile (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisfile (Dynamic) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisfile (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
@echo off
echo ---+++--- Building Vorbisfile (Static) ---+++---
if .%SRCROOT%==. set SRCROOT=c:\src
if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
......
......@@ -24,6 +24,7 @@ vorbis_synthesis
vorbis_synthesis_blockin
vorbis_synthesis_pcmout
vorbis_synthesis_read
vorbis_packet_blocksize
_vi_psy_copy
_mapping_P
_floor_P
......
......@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Dynamic_Release"
# PROP Intermediate_Dir "Dynamic_Release"
# PROP Output_Dir "Vorbis_Dynamic_Release"
# PROP Intermediate_Dir "Vorbis_Dynamic_Release"
# 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 "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c
......@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release"
# 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 /nologo /dll /machine:I386 /out:"Vorbis_Dynamic_Release/vorbis.dll" /libpath:"..\..\ogg\win32\Dynamic_Release"
!ELSEIF "$(CFG)" == "vorbis_dynamic - Win32 Debug"
......@@ -64,8 +64,8 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Dynamic_Debug"
# PROP Intermediate_Dir "Dynamic_Debug"
# PROP Output_Dir "Vorbis_Dynamic_Debug"
# PROP Intermediate_Dir "Vorbis_Dynamic_Debug"
# 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 "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c
......@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbis.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
# 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_d.lib /nologo /dll /debug /machine:I386 /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
!ENDIF
......@@ -116,6 +116,10 @@ SOURCE=..\lib\floor0.c
# End Source File
# Begin Source File
SOURCE=..\lib\floor1.c
# End Source File
# Begin Source File
SOURCE=..\lib\info.c
# End Source File
# Begin Source File
......
......@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Static_Release"
# PROP Intermediate_Dir "Static_Release"
# PROP Output_Dir "Vorbis_Static_Release"
# PROP Intermediate_Dir "Vorbis_Static_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c
......@@ -60,8 +60,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Static_Debug"
# PROP Intermediate_Dir "Static_Debug"
# PROP Output_Dir "Vorbis_Static_Debug"
# PROP Intermediate_Dir "Vorbis_Static_Debug"
# 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 /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c
......@@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
# ADD LIB32 /nologo /out:"Vorbis_Static_Debug\vorbis_static_d.lib"
!ENDIF
......@@ -109,6 +109,10 @@ SOURCE=..\lib\floor0.c
# End Source File
# Begin Source File
SOURCE=..\lib\floor1.c
# End Source File
# Begin Source File
SOURCE=..\lib\info.c
# End Source File
# Begin Source File
......
......@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Dynamic_Release"
# PROP Intermediate_Dir "Dynamic_Release"
# PROP Output_Dir "VorbisEnc_Dynamic_Release"
# PROP Intermediate_Dir "VorbisEnc_Dynamic_Release"
# 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 "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /c
......@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release"
# 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 /nologo /dll /machine:I386 /out:"VorbisEnc_Dynamic_Release/vorbisenc.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
!ELSEIF "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
......@@ -64,8 +64,8 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Dynamic_Debug"
# PROP Intermediate_Dir "Dynamic_Debug"
# PROP Output_Dir "VorbisEnc_Dynamic_Debug"
# PROP Intermediate_Dir "VorbisEnc_Dynamic_Debug"
# 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 "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /GZ /c
......@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisenc.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug"
# 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_d.lib vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug"
!ENDIF
......
......@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Static_Release"
# PROP Intermediate_Dir "Static_Release"
# PROP Output_Dir "VorbisEnc_Static_Release"
# PROP Intermediate_Dir "VorbisEnc_Static_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c
......@@ -60,8 +60,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Static_Debug"
# PROP Intermediate_Dir "Static_Debug"
# PROP Output_Dir "VorbisEnc_Static_Debug"
# PROP Intermediate_Dir "VorbisEnc_Static_Debug"
# 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 /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c
......@@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
# ADD LIB32 /nologo /out:"VorbisEnc_Static_Debug\vorbisenc_static_d.lib"
!ENDIF
......
......@@ -23,3 +23,6 @@ ov_time_tell
ov_info
ov_comment
ov_read
ov_test
ov_test_callbacks
ov_test_open
......@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Dynamic_Release"
# PROP Intermediate_Dir "Dynamic_Release"
# PROP Output_Dir "VorbisFile_Dynamic_Release"
# PROP Intermediate_Dir "VorbisFile_Dynamic_Release"
# 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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /c
......@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /machine:I386 /out:"Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Dynamic_Release"
# 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 /nologo /dll /machine:I386 /out:"VorbisFile_Dynamic_Release/vorbisfile.dll" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:".\Vorbis_Dynamic_Release"
!ELSEIF "$(CFG)" == "vorbisfile_dynamic - Win32 Debug"
......@@ -64,8 +64,8 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Dynamic_Debug"
# PROP Intermediate_Dir "Dynamic_Debug"
# PROP Output_Dir "VorbisFile_Dynamic_Debug"
# PROP Intermediate_Dir "VorbisFile_Dynamic_Debug"
# 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 "VORBISFILE_DYNAMIC_EXPORTS" /YX /FD /GZ /c
......@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# 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 /nologo /dll /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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/vorbisfile.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Dynamic_Debug"
# 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_d.lib vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisFile_Dynamic_Debug/vorbisfile_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug"
!ENDIF
......
......@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Static_Release"
# PROP Intermediate_Dir "Static_Release"
# PROP Output_Dir "VorbisFile_Static_Release"
# PROP Intermediate_Dir "VorbisFile_Static_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W2 /GX /O2 /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /c
......@@ -60,8 +60,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Static_Debug"
# PROP Intermediate_Dir "Static_Debug"
# PROP Output_Dir "VorbisFile_Static_Debug"
# PROP Intermediate_Dir "VorbisFile_Static_Debug"
# 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 /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /YX /FD /GZ /c
......@@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
# ADD LIB32 /nologo /out:"VorbisFile_Static_Debug\vorbisfile_static_d.lib"
!ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment