コミット: c8986b7f86bd98abe7e0fa59c131fe2736c723ca - pecaim (git)

コミットメタ情報

• リビジョン: c8986b7f86bd98abe7e0fa59c131fe2736c723ca (tree)
• 日時: 2011-03-01 03:00:17
• 作者: eru <eru01@user...>
• コミッター: eru

ログメッセージ

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

変更サマリ

• modified: ui/win32/PeerCast.sln
• modified: ui/win32/Simple_vp/Simple_vp.vcproj
• add: ui/win32/Simple_vp/resource.hm
• modified: ui/win32/simple/Simple.vcproj
• add: ui/win32/simple/resource.hm

差分

--- a/ui/win32/PeerCast.sln
+++ b/ui/win32/PeerCast.sln
@@ -13,30 +13,82 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcp
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple_vp", "Simple_vp\Simple_vp.vcproj", "{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Private Debug|Win32 = Private Debug|Win32
+		Private Debug|x64 = Private Debug|x64
 		Private Release|Win32 = Private Release|Win32
+		Private Release|x64 = Private Release|x64
+		Release(SSE2)|Win32 = Release(SSE2)|Win32
+		Release(SSE2)|x64 = Release(SSE2)|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|Win32.Build.0 = Debug|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|x64.ActiveCfg = Debug|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Debug|x64.Build.0 = Debug|x64
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|Win32.Build.0 = Private Debug|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|x64.ActiveCfg = Private Debug|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Debug|x64.Build.0 = Private Debug|x64
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|Win32.ActiveCfg = Private Release|Win32
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|Win32.Build.0 = Private Release|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|x64.ActiveCfg = Private Release|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Private Release|x64.Build.0 = Private Release|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|Win32.ActiveCfg = Release(SSE2)|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|Win32.Build.0 = Release(SSE2)|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|x64.ActiveCfg = Release(SSE2)|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release(SSE2)|x64.Build.0 = Release(SSE2)|x64
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|Win32.ActiveCfg = Release|Win32
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|Win32.Build.0 = Release|Win32
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|x64.ActiveCfg = Release|x64
+		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}.Release|x64.Build.0 = Release|x64
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Debug|Win32.Build.0 = Debug|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Debug|x64.ActiveCfg = Debug|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Debug|x64.Build.0 = Debug|x64
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|Win32.Build.0 = Private Debug|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|x64.ActiveCfg = Private Debug|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Debug|x64.Build.0 = Private Debug|x64
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|Win32.ActiveCfg = Private Release|Win32
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|Win32.Build.0 = Private Release|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|x64.ActiveCfg = Private Release|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Private Release|x64.Build.0 = Private Release|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|Win32.ActiveCfg = Release(SSE2)|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|Win32.Build.0 = Release(SSE2)|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|x64.ActiveCfg = Release(SSE2)|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release(SSE2)|x64.Build.0 = Release(SSE2)|x64
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Release|Win32.ActiveCfg = Release|Win32
 		{7D4833CE-1286-4587-9470-52E098B29C12}.Release|Win32.Build.0 = Release|Win32
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release|x64.ActiveCfg = Release|x64
+		{7D4833CE-1286-4587-9470-52E098B29C12}.Release|x64.Build.0 = Release|x64
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|Win32.Build.0 = Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug|x64.ActiveCfg = Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|Win32.ActiveCfg = Private Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|Win32.Build.0 = Private Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug|x64.ActiveCfg = Private Debug|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|Win32.ActiveCfg = Private Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|Win32.Build.0 = Private Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Release|x64.ActiveCfg = Private Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|Win32.ActiveCfg = Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|Win32.Build.0 = Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|x64.ActiveCfg = Release|x64
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release(SSE2)|x64.Build.0 = Release|x64
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|Win32.ActiveCfg = Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|Win32.Build.0 = Release|Win32
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|x64.ActiveCfg = Release|x64
+		{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/ui/win32/Simple_vp/Simple_vp.vcproj
+++ b/ui/win32/Simple_vp/Simple_vp.vcproj
@@ -5,9 +5,6 @@
 	Name="Simple_vp"
 	ProjectGUID="{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}"
 	RootNamespace="Simple"
-	SccProjectName=""$/PeerCast.root/PeerCast", JCAAAAAA"
-	SccLocalPath="..\..\.."
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>

--- /dev/null
+++ b/ui/win32/Simple_vp/resource.hm
@@ -0,0 +1,4 @@
+// Microsoft Developer Studio generated Help ID include file.
+// Used by Simple.rc
+//
+#define HIDC_CONTACT                    0x808803f3    // IDD_CHANINFO

--- a/ui/win32/simple/Simple.vcproj
+++ b/ui/win32/simple/Simple.vcproj
@@ -391,7 +391,7 @@
 				OutputFile="Release/PeerCast.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release""
+				AdditionalLibraryDirectories="../../../core\win32\lib\Release"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/PeerCast.pdb"
 				StripPrivateSymbols="PeerCast-dist.pdb"
@@ -426,6 +426,7 @@
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp"
 				CommandLine="copy                   release\peercast.exe                   ..\pimp\
"
+				ExcludedFromBuild="true"
 			/>
 		</Configuration>
 		<Configuration
@@ -501,7 +502,7 @@
 				OutputFile="Release/PeerCast.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
+				AdditionalLibraryDirectories="../../../core/win32/lib/release"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/PeerCast.pdb"
 				StripPrivateSymbols="PeerCast-dist.pdb"
@@ -535,6 +536,7 @@
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp"
 				CommandLine="copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
+				ExcludedFromBuild="true"
 			/>
 		</Configuration>
 		<Configuration

--- /dev/null
+++ b/ui/win32/simple/resource.hm
@@ -0,0 +1,4 @@
+// Microsoft Developer Studio generated Help ID include file.
+// Used by Simple.rc
+//
+#define HIDC_CONTACT                    0x808803f3    // IDD_CHANINFO