[xiph-commits] r7132 - in branches/rel-1-0-branch/speex/win32: .

oddsock at dactyl.lonelymoon.com oddsock
Wed Jul 14 22:10:37 PDT 2004


libspeex speexdec speexenc
Message-ID: <20040715051037.101F19AAAB at dactyl.lonelymoon.com>

Author: oddsock
Date: Wed Jul 14 22:10:37 2004
New Revision: 7132

Added:
branches/rel-1-0-branch/speex/win32/speex.iss
branches/rel-1-0-branch/speex/win32/speexlogo.bmp
Modified:
branches/rel-1-0-branch/speex/win32/libspeex/libspeex.dsp
branches/rel-1-0-branch/speex/win32/speexdec/speexdec.dsp
branches/rel-1-0-branch/speex/win32/speexenc/speexenc.dsp
Log:
misc updates to win32 project files
added inno setup file for creating binary packages

Modified: branches/rel-1-0-branch/speex/win32/libspeex/libspeex.dsp
===================================================================
--- branches/rel-1-0-branch/speex/win32/libspeex/libspeex.dsp	2004-07-15 05:08:22 UTC (rev 7131)
+++ branches/rel-1-0-branch/speex/win32/libspeex/libspeex.dsp	2004-07-15 05:10:37 UTC (rev 7132)
@@ -25,7 +25,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
RSC=rc.exe

!IF  "$(CFG)" == "libspeex - Win32 Release"
@@ -42,13 +42,13 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /GX /Ox /Ot /Og /Oi /Ob2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo

@@ -66,13 +66,13 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo


Added: branches/rel-1-0-branch/speex/win32/speex.iss
===================================================================
--- branches/rel-1-0-branch/speex/win32/speex.iss	2004-07-15 05:08:22 UTC (rev 7131)
+++ branches/rel-1-0-branch/speex/win32/speex.iss	2004-07-15 05:10:37 UTC (rev 7132)
@@ -0,0 +1,54 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=Speex
+AppVerName=Speex V1.0.4
+AppPublisherURL=http://www.speex.org
+AppSupportURL=http://www.speex.org
+AppUpdatesURL=http://www.speex.org
+DefaultDirName={pf}\Speex
+DefaultGroupName=Speex
+AllowNoIcons=yes
+LicenseFile=..\COPYING
+InfoAfterFile=..\README
+OutputDir=.
+OutputBaseFilename=speex_win32_1.0.4_setup
+WizardImageFile=speexlogo.bmp
+; uncomment the following line if you want your installation to run on NT 3.51 too.
+; MinVersion=4,3.51
+
+[Tasks]
+;Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4
+
+[Dirs]
+Name: "{app}"
+Name: "{app}\doc"
+Name: "{app}\libspeex"
+Name: "{app}\libspeex\include"
+Name: "{app}\libspeex\include\speex"
+
+[Files]
+Source: "speexdec\Release\speexdec.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "speexenc\Release\speexenc.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\doc\draft-herlein-avt-rtp-speex-00.txt"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\manual.lyx"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\programming.html"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\rtp.txt"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\sampledec.c"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "..\doc\sampleenc.c"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "libspeex\Release\libspeex.lib"; DestDir: "{app}\libspeex"; Flags: ignoreversion
+Source: "..\include\speex.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion
+Source: "..\include\speex_bits.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion
+Source: "..\include\speex_callbacks.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion
+Source: "..\include\speex_header.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion
+Source: "..\include\speex_stereo.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion
+Source: "..\include\speex\speex.h"; DestDir: "{app}\libspeex\include\speex\"; Flags: ignoreversion
+Source: "..\include\speex\speex_bits.h"; DestDir: "{app}\libspeex\include\speex\"; Flags: ignoreversion
+Source: "..\include\speex\speex_callbacks.h"; DestDir: "{app}\libspeex\include\speex\"; Flags: ignoreversion
+Source: "..\include\speex\speex_header.h"; DestDir: "{app}\libspeex\include\speex\"; Flags: ignoreversion
+Source: "..\include\speex\speex_stereo.h"; DestDir: "{app}\libspeex\include\speex\"; Flags: ignoreversion
+
+[Run]
+

Modified: branches/rel-1-0-branch/speex/win32/speexdec/speexdec.dsp
===================================================================
--- branches/rel-1-0-branch/speex/win32/speexdec/speexdec.dsp	2004-07-15 05:08:22 UTC (rev 7131)
+++ branches/rel-1-0-branch/speex/win32/speexdec/speexdec.dsp	2004-07-15 05:10:37 UTC (rev 7132)
@@ -25,7 +25,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
RSC=rc.exe

!IF  "$(CFG)" == "speexdec - Win32 Release"
@@ -42,13 +42,13 @@
# 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 /GX /O1 /I "../../libspeex" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /GX /O1 /I "../../include" /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+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 /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 winmm.lib /nologo /subsystem:console /machine:I386

@@ -66,13 +66,13 @@
# 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 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ "../../libspeex" /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ "../../libspeex" /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+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 /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 winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept


Modified: branches/rel-1-0-branch/speex/win32/speexenc/speexenc.dsp
===================================================================
--- branches/rel-1-0-branch/speex/win32/speexenc/speexenc.dsp	2004-07-15 05:08:22 UTC (rev 7131)
+++ branches/rel-1-0-branch/speex/win32/speexenc/speexenc.dsp	2004-07-15 05:10:37 UTC (rev 7132)
@@ -25,7 +25,7 @@
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
RSC=rc.exe

!IF  "$(CFG)" == "speexenc - Win32 Release"
@@ -42,13 +42,13 @@
# 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 /GX /O1 /Ob2 /I "../../libspeex" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /GX /O1 /Ob2 /I "../../include" /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+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 /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 /nologo /subsystem:console /machine:I386

@@ -66,13 +66,13 @@
# 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 "../../libspeex" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../libspeex" /I "../../../ogg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+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 /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept


Added: branches/rel-1-0-branch/speex/win32/speexlogo.bmp
===================================================================
(Binary files differ)


Property changes on: branches/rel-1-0-branch/speex/win32/speexlogo.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream



More information about the commits mailing list