summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJack Moffitt <jack@xiph.org>2001-06-18 15:01:21 +0000
committerJack Moffitt <jack@xiph.org>2001-06-18 15:01:21 +0000
commitc9d34b61eee229b534397ea5da6b6685e8efb6bd (patch)
tree98d8daffbdcc03f4d199d08fdfc7bf02aec4c36e /win32
parentac505bc6fa8b0654d02ba0767062383eb8d7b686 (diff)
downloadogg-c9d34b61eee229b534397ea5da6b6685e8efb6bd.tar.gz
Win32 Builds updates, including ingo's suggestions.
git-svn-id: http://svn.xiph.org/trunk/ogg@1503 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'win32')
-rwxr-xr-xwin32/build_ogg_dynamic.bat2
-rwxr-xr-xwin32/build_ogg_dynamic_debug.bat2
-rwxr-xr-xwin32/build_ogg_static.bat2
-rwxr-xr-xwin32/build_ogg_static_debug.bat2
-rw-r--r--win32/ogg.def1
-rw-r--r--win32/ogg_dynamic.dsp6
-rw-r--r--win32/ogg_static.dsp2
7 files changed, 9 insertions, 8 deletions
diff --git a/win32/build_ogg_dynamic.bat b/win32/build_ogg_dynamic.bat
index 344038b..f5c0668 100755
--- a/win32/build_ogg_dynamic.bat
+++ b/win32/build_ogg_dynamic.bat
@@ -1,7 +1,7 @@
@echo off
echo ---+++--- Building Ogg (Dynamic) ---+++---
-if .%SRCROOT%==. set SRCROOT=c:\src
+if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
diff --git a/win32/build_ogg_dynamic_debug.bat b/win32/build_ogg_dynamic_debug.bat
index 9289edc..300ce41 100755
--- a/win32/build_ogg_dynamic_debug.bat
+++ b/win32/build_ogg_dynamic_debug.bat
@@ -1,7 +1,7 @@
@echo off
echo ---+++--- Building Ogg (Dynamic) ---+++---
-if .%SRCROOT%==. set SRCROOT=c:\src
+if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
diff --git a/win32/build_ogg_static.bat b/win32/build_ogg_static.bat
index f5f8215..905a8f6 100755
--- a/win32/build_ogg_static.bat
+++ b/win32/build_ogg_static.bat
@@ -1,7 +1,7 @@
@echo off
echo ---+++--- Building Ogg (Static) ---+++---
-if .%SRCROOT%==. set SRCROOT=c:\src
+if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
diff --git a/win32/build_ogg_static_debug.bat b/win32/build_ogg_static_debug.bat
index 3aef481..e2f66af 100755
--- a/win32/build_ogg_static_debug.bat
+++ b/win32/build_ogg_static_debug.bat
@@ -1,7 +1,7 @@
@echo off
echo ---+++--- Building Ogg (Static) ---+++---
-if .%SRCROOT%==. set SRCROOT=c:\src
+if .%SRCROOT%==. set SRCROOT=i:\xiph
set OLDPATH=%PATH%
set OLDINCLUDE=%INCLUDE%
diff --git a/win32/ogg.def b/win32/ogg.def
index cd9744b..605dd98 100644
--- a/win32/ogg.def
+++ b/win32/ogg.def
@@ -35,6 +35,7 @@ ogg_stream_clear
ogg_stream_reset
ogg_stream_destroy
ogg_stream_eos
+ogg_stream_packetpeek
ogg_page_version
ogg_page_continued
ogg_page_bos
diff --git a/win32/ogg_dynamic.dsp b/win32/ogg_dynamic.dsp
index e7407f5..529ab03 100644
--- a/win32/ogg_dynamic.dsp
+++ b/win32/ogg_dynamic.dsp
@@ -68,8 +68,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "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 "OGG_DYNAMIC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OGG_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OGG_DYNAMIC_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OGG_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/ogg.dll" /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 /nologo /dll /debug /machine:I386 /out:"Dynamic_Debug/ogg_d.dll" /pdbtype:sept
!ENDIF
diff --git a/win32/ogg_static.dsp b/win32/ogg_static.dsp
index fc88c78..2d4cefe 100644
--- a/win32/ogg_static.dsp
+++ b/win32/ogg_static.dsp
@@ -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:"Static_Debug\ogg_static_d.lib"
!ENDIF