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

arek at svn.xiph.org arek at svn.xiph.org
Fri Jan 27 05:52:46 PST 2006 

Author: arek
Date: 2006-01-27 05:52:35 -0800 (Fri, 27 Jan 2006)
New Revision: 10754

Added:
   trunk/xiph-qt/build-win32/build_XiphQT_debug_broken.bat
Modified:
   trunk/xiph-qt/build-win32/
   trunk/xiph-qt/build-win32/XiphQT.dsp
Log:
Fixed some build issues on win32.


Property changes on: trunk/xiph-qt/build-win32
___________________________________________________________________
Name: svn:ignore
   - Debug
Release
*.ncb
*.opt
*.plg

   + Debug
Debug_broken
Release
*.ncb
*.opt
*.plg


Modified: trunk/xiph-qt/build-win32/XiphQT.dsp
===================================================================
--- trunk/xiph-qt/build-win32/XiphQT.dsp	2006-01-25 10:40:48 UTC (rev 10753)
+++ trunk/xiph-qt/build-win32/XiphQT.dsp	2006-01-27 13:52:35 UTC (rev 10754)
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=XiphQT - Win32 Debug
+CFG=XiphQT - Win32 Debug broken
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,13 @@
 !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 "XiphQT.mak" CFG="XiphQT - Win32 Debug"
+!MESSAGE NMAKE /f "XiphQT.mak" CFG="XiphQT - Win32 Debug broken"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "XiphQT - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "XiphQT - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "XiphQT - Win32 Debug broken" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -97,12 +98,49 @@
 PostBuild_Cmds=if exist "$(IntDir)\$(TargetName).qtx" Attrib -R "$(IntDir)\$(TargetName).qtx"	RezWack -f -d "$(IntDir)\$(TargetName).dll" -r "$(IntDir)\$(TargetName).qtr" -o "$(IntDir)\$(TargetName).qtx"	copy /y "$(IntDir)\$(TargetName).qtx" "c:\Program Files\QuickTime\QTComponents\"
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "XiphQT - Win32 Debug broken"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_broken"
+# PROP BASE Intermediate_Dir "Debug_broken"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_broken"
+# PROP Intermediate_Dir "Debug_broken"
+# 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /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 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"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+IntDir=.\Debug_broken
+TargetName=XiphQT
+SOURCE="$(InputPath)"
+PostBuild_Desc=qtx-ing
+PostBuild_Cmds=if exist "$(IntDir)\$(TargetName).qtx" Attrib -R "$(IntDir)\$(TargetName).qtx"	RezWack -f -d "$(IntDir)\$(TargetName).dll" -r "$(IntDir)\$(TargetName).qtr" -o "$(IntDir)\$(TargetName).qtx"	copy /y "$(IntDir)\$(TargetName).qtx" "c:\Program Files\QuickTime\QTComponents\"
+# End Special Build Tool
+
 !ENDIF 
 
 # Begin Target
 
 # Name "XiphQT - Win32 Release"
 # Name "XiphQT - Win32 Debug"
+# Name "XiphQT - Win32 Debug broken"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -143,6 +181,14 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\OggImport\src\stream_flac.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\OggImport\src\stream_flac.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\OggImport\src\stream_speex.c
 # End Source File
 # Begin Source File
@@ -151,6 +197,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\OggImport\src\stream_types_flac.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\OggImport\src\stream_types_speex.h
 # End Source File
 # Begin Source File
@@ -406,6 +456,18 @@
 
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "XiphQT - Win32 Debug broken"
+
+# Begin Custom Build
+TargetDir=.\Debug_broken
+TargetName=XiphQT
+InputPath=.\resources.r
+
+"$(TargetDir)\$(TargetName).qtr" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	Rez.exe -p -i "C:\Program Files\QuickTime SDK\RIncludes" -i ..\OggImport\src -i ..\CAVorbis\src -i ..\CASpeex\src -i ..\common -i ..\utils -i ..\resources -o "$(TargetDir)\$(TargetName).qtr" <  "$(InputPath)"
+
+# End Custom Build
+
 !ENDIF 
 
 # End Source File

Added: trunk/xiph-qt/build-win32/build_XiphQT_debug_broken.bat
===================================================================
--- trunk/xiph-qt/build-win32/build_XiphQT_debug_broken.bat	2006-01-25 10:40:48 UTC (rev 10753)
+++ trunk/xiph-qt/build-win32/build_XiphQT_debug_broken.bat	2006-01-27 13:52:35 UTC (rev 10754)
@@ -0,0 +1,22 @@
+ at echo off
+echo ---+++--- Building XiphQT ---+++---
+
+set BTARGET=build
+
+if NOT z%1==z (set BTARGET=%1)
+
+set OLDPATH=%PATH%
+set OLDINCLUDE=%INCLUDE%
+set OLDLIB=%LIB%
+
+call "c:\program files\microsoft visual studio\vc98\bin\vcvars32.bat"
+echo Setting include/lib paths for XiphQT
+set PATH=%PATH%;"C:\Program Files\QuickTime SDK\Tools"
+set INCLUDE=%INCLUDE%;"C:\Program Files\QuickTime SDK\CIncludes";"C:\Program Files\QuickTime SDK\ComponentIncludes"
+set LIB=%LIB%;"C:\Program Files\QuickTime SDK\Libraries"
+echo Compiling...
+msdev XiphQT.dsp /useenv /make "XiphQT - Win32 Debug broken" /%BTARGET%
+
+set PATH=%OLDPATH%
+set INCLUDE=%OLDINCLUDE%
+set LIB=%OLDLIB%


Property changes on: trunk/xiph-qt/build-win32/build_XiphQT_debug_broken.bat
___________________________________________________________________
Name: svn:executable
   + *

More information about the commits mailing list