• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FLVなど sext styp のついた配信のリレーができない問題を修正するパッチ


Commit MetaInfo

修订版c8986b7f86bd98abe7e0fa59c131fe2736c723ca (tree)
时间2011-03-01 03:00:17
作者eru <eru01@user...>
Commitereru

Log Message

ビルドできなくなっていたのを修正

更改概述

差异

--- a/ui/win32/PeerCast.sln
+++ b/ui/win32/PeerCast.sln
@@ -13,30 +13,82 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcp
1313 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
1414 EndProjectSection
1515 EndProject
16+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple_vp", "Simple_vp\Simple_vp.vcproj", "{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}"
17+ ProjectSection(ProjectDependencies) = postProject
18+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
19+ EndProjectSection
20+EndProject
1621 Global
1722 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1823 Debug|Win32 = Debug|Win32
24+ Debug|x64 = Debug|x64
1925 Private Debug|Win32 = Private Debug|Win32
26+ Private Debug|x64 = Private Debug|x64
2027 Private Release|Win32 = Private Release|Win32
28+ Private Release|x64 = Private Release|x64
29+ Release(SSE2)|Win32 = Release(SSE2)|Win32
30+ Release(SSE2)|x64 = Release(SSE2)|x64
2131 Release|Win32 = Release|Win32
32+ Release|x64 = Release|x64
2233 EndGlobalSection
2334 GlobalSection(ProjectConfigurationPlatforms) = postSolution
2435 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|Win32.ActiveCfg = Debug|Win32
2536 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|Win32.Build.0 = Debug|Win32
37+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|x64.ActiveCfg = Debug|x64
38+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|x64.Build.0 = Debug|x64
2639 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
2740 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|Win32.Build.0 = Private Debug|Win32
41+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|x64.ActiveCfg = Private Debug|x64
42+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|x64.Build.0 = Private Debug|x64
2843 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|Win32.ActiveCfg = Private Release|Win32
2944 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|Win32.Build.0 = Private Release|Win32
45+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|x64.ActiveCfg = Private Release|x64
46+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|x64.Build.0 = Private Release|x64
47+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|Win32.ActiveCfg = Release(SSE2)|Win32
48+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|Win32.Build.0 = Release(SSE2)|Win32
49+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|x64.ActiveCfg = Release(SSE2)|x64
50+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|x64.Build.0 = Release(SSE2)|x64
3051 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|Win32.ActiveCfg = Release|Win32
3152 {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|Win32.Build.0 = Release|Win32
53+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|x64.ActiveCfg = Release|x64
54+ {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|x64.Build.0 = Release|x64
3255 {7D4833CE-1286-4587-9470-52E098B29C12}.Debug|Win32.ActiveCfg = Debug|Win32
3356 {7D4833CE-1286-4587-9470-52E098B29C12}.Debug|Win32.Build.0 = Debug|Win32
57+ {7D4833CE-1286-4587-9470-52E098B29C12}.Debug|x64.ActiveCfg = Debug|x64
58+ {7D4833CE-1286-4587-9470-52E098B29C12}.Debug|x64.Build.0 = Debug|x64
3459 {7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
3560 {7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|Win32.Build.0 = Private Debug|Win32
61+ {7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|x64.ActiveCfg = Private Debug|x64
62+ {7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|x64.Build.0 = Private Debug|x64
3663 {7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|Win32.ActiveCfg = Private Release|Win32
3764 {7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|Win32.Build.0 = Private Release|Win32
65+ {7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|x64.ActiveCfg = Private Release|x64
66+ {7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|x64.Build.0 = Private Release|x64
67+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|Win32.ActiveCfg = Release(SSE2)|Win32
68+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|Win32.Build.0 = Release(SSE2)|Win32
69+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|x64.ActiveCfg = Release(SSE2)|x64
70+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|x64.Build.0 = Release(SSE2)|x64
3871 {7D4833CE-1286-4587-9470-52E098B29C12}.Release|Win32.ActiveCfg = Release|Win32
3972 {7D4833CE-1286-4587-9470-52E098B29C12}.Release|Win32.Build.0 = Release|Win32
73+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release|x64.ActiveCfg = Release|x64
74+ {7D4833CE-1286-4587-9470-52E098B29C12}.Release|x64.Build.0 = Release|x64
75+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|Win32.ActiveCfg = Debug|Win32
76+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|Win32.Build.0 = Debug|Win32
77+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|x64.ActiveCfg = Debug|Win32
78+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
79+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|Win32.Build.0 = Private Debug|Win32
80+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|x64.ActiveCfg = Private Debug|Win32
81+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|Win32.ActiveCfg = Private Release|Win32
82+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|Win32.Build.0 = Private Release|Win32
83+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|x64.ActiveCfg = Private Release|Win32
84+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|Win32.ActiveCfg = Release|Win32
85+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|Win32.Build.0 = Release|Win32
86+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|x64.ActiveCfg = Release|x64
87+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|x64.Build.0 = Release|x64
88+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|Win32.ActiveCfg = Release|Win32
89+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|Win32.Build.0 = Release|Win32
90+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|x64.ActiveCfg = Release|x64
91+ {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|x64.Build.0 = Release|x64
4092 EndGlobalSection
4193 GlobalSection(SolutionProperties) = preSolution
4294 HideSolutionNode = FALSE
--- a/ui/win32/Simple_vp/Simple_vp.vcproj
+++ b/ui/win32/Simple_vp/Simple_vp.vcproj
@@ -5,9 +5,6 @@
55 Name="Simple_vp"
66 ProjectGUID="{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}"
77 RootNamespace="Simple"
8- SccProjectName="&quot;$/PeerCast.root/PeerCast&quot;, JCAAAAAA"
9- SccLocalPath="..\..\.."
10- SccProvider="MSSCCI:Microsoft Visual SourceSafe"
118 TargetFrameworkVersion="131072"
129 >
1310 <Platforms>
--- /dev/null
+++ b/ui/win32/Simple_vp/resource.hm
@@ -0,0 +1,4 @@
1+// Microsoft Developer Studio generated Help ID include file.
2+// Used by Simple.rc
3+//
4+#define HIDC_CONTACT 0x808803f3 // IDD_CHANINFO
--- a/ui/win32/simple/Simple.vcproj
+++ b/ui/win32/simple/Simple.vcproj
@@ -391,7 +391,7 @@
391391 OutputFile="Release/PeerCast.exe"
392392 LinkIncremental="1"
393393 SuppressStartupBanner="true"
394- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
394+ AdditionalLibraryDirectories="../../../core\win32\lib\Release"
395395 GenerateDebugInformation="true"
396396 ProgramDatabaseFile=".\Release/PeerCast.pdb"
397397 StripPrivateSymbols="PeerCast-dist.pdb"
@@ -426,6 +426,7 @@
426426 Name="VCPostBuildEventTool"
427427 Description="Copy exe to pimp"
428428 CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
429+ ExcludedFromBuild="true"
429430 />
430431 </Configuration>
431432 <Configuration
@@ -501,7 +502,7 @@
501502 OutputFile="Release/PeerCast.exe"
502503 LinkIncremental="1"
503504 SuppressStartupBanner="true"
504- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
505+ AdditionalLibraryDirectories="../../../core/win32/lib/release"
505506 GenerateDebugInformation="true"
506507 ProgramDatabaseFile=".\Release/PeerCast.pdb"
507508 StripPrivateSymbols="PeerCast-dist.pdb"
@@ -535,6 +536,7 @@
535536 Name="VCPostBuildEventTool"
536537 Description="Copy exe to pimp"
537538 CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
539+ ExcludedFromBuild="true"
538540 />
539541 </Configuration>
540542 <Configuration
--- /dev/null
+++ b/ui/win32/simple/resource.hm
@@ -0,0 +1,4 @@
1+// Microsoft Developer Studio generated Help ID include file.
2+// Used by Simple.rc
3+//
4+#define HIDC_CONTACT 0x808803f3 // IDD_CHANINFO