[xiph-commits] r11635 - in branches/oggdsf_ce_port: . bin build/NSIS/Release src/lib/core/directshow/dsfOggDemux2

[illiminable at svn.xiph.org]

Author: illiminable
Date: 2006-06-23 12:22:34 -0700 (Fri, 23 Jun 2006)
New Revision: 11635

Added:
   branches/oggdsf_ce_port/bin/
   branches/oggdsf_ce_port/bin/MSLUM80.dll
   branches/oggdsf_ce_port/bin/MSLUM80D.dll
   branches/oggdsf_ce_port/bin/MSLUP80.dll
   branches/oggdsf_ce_port/bin/MSLUP80D.dll
   branches/oggdsf_ce_port/bin/MSLUR80.dll
   branches/oggdsf_ce_port/bin/MSLUR80D.dll
   branches/oggdsf_ce_port/bin/Microsoft.VC80.CRT.manifest
Modified:
   branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi
   branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
Log:
* Add custom built c runtime libraries which include the unicode compatability layer for 9X/ME machines to the repository.
* To build with this support you also have to overwrite some of visual studios files, or the resulting package will only work on NT/2k/XP, plus you have to distribute these modified versions instead of the usual runtime libraries.
* Package release is about 50% bigger than it used to be
* Update the NSIS installer script to use the modified libraries


Added: branches/oggdsf_ce_port/bin/MSLUM80.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUM80.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/MSLUM80D.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUM80D.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/MSLUP80.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUP80.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/MSLUP80D.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUP80D.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/MSLUR80.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUR80.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/MSLUR80D.dll
===================================================================
(Binary files differ)


Property changes on: branches/oggdsf_ce_port/bin/MSLUR80D.dll
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/oggdsf_ce_port/bin/Microsoft.VC80.CRT.manifest
===================================================================
--- branches/oggdsf_ce_port/bin/Microsoft.VC80.CRT.manifest	2006-06-23 14:18:53 UTC (rev 11634)
+++ branches/oggdsf_ce_port/bin/Microsoft.VC80.CRT.manifest	2006-06-23 19:22:34 UTC (rev 11635)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright © 1981-2001 Microsoft Corporation -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity 
+        type="win32" 
+        name="Microsoft.VC80.CRT" 
+        version="8.0.50608.0" 
+        processorArchitecture="x86" 
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr80.dll"/>
+    <file name="msvcp80.dll"/>
+    <file name="msvcm80.dll"/>
+</assembly>

Modified: branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi	2006-06-23 14:18:53 UTC (rev 11634)
+++ branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi	2006-06-23 19:22:34 UTC (rev 11635)
@@ -3,7 +3,16 @@
 ; Location of Visual Studio runtime libraries on the compiling system
 ;   ************* Change this to match the path where msvcp71.dll and msvcr71.dll live ******************
 ; !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
-!define VS_RUNTIME_LOCATION "C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT"
+
+
+; !define VS_RUNTIME_LOCATION "C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT"
+; !define VS_RUNTIME_LOCATION_PREFIX "C:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\MSVC"
+
+
+;  To use the unicows enabled versions, use these rebuilt crt's
+
+!define VS_RUNTIME_LOCATION ..\..\..\bin
+!define VS_RUNTIME_LOCATION_PREFIX ..\..\..\bin\MSLU
 ;   *****************************************************************************************************
 
 ; HM NIS Edit Wizard helper defines
@@ -105,8 +114,8 @@
   SetOverwrite ifnewer
 
   ; Runtime libraries from visual studio - 3
-  File "${VS_RUNTIME_LOCATION}\msvcr80.dll"
-  File "${VS_RUNTIME_LOCATION}\msvcp80.dll"
+  File "${VS_RUNTIME_LOCATION_PREFIX}r80.dll"
+  File "${VS_RUNTIME_LOCATION_PREFIX}p80.dll"
   File "${VS_RUNTIME_LOCATION}\Microsoft.VC80.CRT.manifest"
 
   ; Unicows for old windows with no unicode - 1

Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2006-06-23 14:18:53 UTC (rev 11634)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp	2006-06-23 19:22:34 UTC (rev 11635)
@@ -140,7 +140,7 @@
 	,	mUsingCustomSource(false)
 
 {
-    debugLog.open(L"d:\\demux.log", ios_base::out);
+    debugLog.open(L"c:\\demux.log", ios_base::out);
 	debugLog<<L"Constructor"<<endl;
 
 	//Why do we do this, should the base class do it ?