[xiph-commits] r11327 - trunk/xiph-qt/build-win32

arek at svn.xiph.org arek at svn.xiph.org
Sun Apr 30 18:48:37 PDT 2006 

Author: arek
Date: 2006-04-30 18:48:33 -0700 (Sun, 30 Apr 2006)
New Revision: 11327

Modified:
   trunk/xiph-qt/build-win32/XiphQT.def
   trunk/xiph-qt/build-win32/XiphQT.dsp
   trunk/xiph-qt/build-win32/resources.r
Log:
Updated win32 build files.

Modified: trunk/xiph-qt/build-win32/XiphQT.def
===================================================================
--- trunk/xiph-qt/build-win32/XiphQT.def	2006-05-01 01:42:42 UTC (rev 11326)
+++ trunk/xiph-qt/build-win32/XiphQT.def	2006-05-01 01:48:33 UTC (rev 11327)
@@ -44,5 +44,6 @@
 	CASpeexDecoderEntry
 	CAOggSpeexDecoderEntry
 	OggImportComponentDispatch
+	Theora_ImageCodecComponentDispatch
 
 

Modified: trunk/xiph-qt/build-win32/XiphQT.dsp
===================================================================
--- trunk/xiph-qt/build-win32/XiphQT.dsp	2006-05-01 01:42:42 UTC (rev 11326)
+++ trunk/xiph-qt/build-win32/XiphQT.dsp	2006-05-01 01:48:33 UTC (rev 11327)
@@ -44,7 +44,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 "XIPHQT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\..\theora-exp\include\theora" /I "..\common" /I "..\utils" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,7 +54,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 /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 qtmlClient.lib libspeex.lib ogg_static.lib vorbis_static.lib /nologo /dll /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Release" /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_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 qtmlClient.lib libspeex.lib ogg_static.lib vorbis_static.lib theoradec_static.lib /nologo /dll /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Release" /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release" /libpath:"..\..\theora-exp\win32\msvc60\Release_theoradec_static"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 IntDir=.\Release
@@ -78,7 +78,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 "XIPHQT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\..\theora-exp\include\theora" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -88,7 +88,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 /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 qtmlClient.lib libspeex.lib ogg_static_d.lib vorbis_static_d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /pdbtype:sept /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Debug" /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_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 qtmlClient.lib libspeex.lib ogg_static_d.lib vorbis_static_d.lib theoradec_static.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /pdbtype:sept /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Debug" /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug" /libpath:"..\..\theora-exp\win32\msvc60\Release_theoradec_static"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 IntDir=.\Debug
@@ -113,7 +113,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\..\theora-exp\include\theora" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -124,7 +124,7 @@
 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 qtmlClient.lib libspeex.lib ogg_static_d.lib vorbis_static_d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /pdbtype:sept /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Debug" /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug"
 # SUBTRACT BASE LINK32 /pdb:none
-# 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 qtmlClient.lib libspeex.lib ogg_static_d.lib vorbis_static_d.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /pdbtype:sept /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Debug" /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_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 qtmlClient.lib libspeex.lib ogg_static_d.lib vorbis_static_d.lib theoradec_static.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcd.lib" /def:".\XiphQT.def" /pdbtype:sept /libpath:"C:\Program Files\QuickTime SDK\Libraries" /libpath:"..\..\speex\win32\libspeex\Debug" /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug" /libpath:"..\..\theora-exp\win32\msvc60\Release_theoradec_static"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 IntDir=.\Debug_broken
@@ -197,6 +197,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\OggImport\src\stream_theora.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\OggImport\src\stream_theora.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\OggImport\src\stream_types_flac.h
 # End Source File
 # Begin Source File
@@ -205,6 +213,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\OggImport\src\stream_types_theora.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\OggImport\src\stream_types_vorbis.h
 # End Source File
 # Begin Source File
@@ -217,6 +229,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\OggImport\src\utils.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\OggImport\src\utils.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\OggImport\src\versions.h
 # End Source File
 # End Group

Modified: trunk/xiph-qt/build-win32/resources.r
===================================================================
--- trunk/xiph-qt/build-win32/resources.r	2006-05-01 01:42:42 UTC (rev 11326)
+++ trunk/xiph-qt/build-win32/resources.r	2006-05-01 01:48:33 UTC (rev 11327)
@@ -36,3 +36,9 @@
 #include "CASpeexDecoderPublic.r"
 
 #include "OggImport.r"
+
+#undef __COMPONENTS_R__
+#undef version
+
+#include "TheoraDecoder.r"
+

More information about the commits mailing list