From c8986b7f86bd98abe7e0fa59c131fe2736c723ca Mon Sep 17 00:00:00 2001 From: eru Date: Tue, 1 Mar 2011 03:00:17 +0900 Subject: [PATCH] =?utf8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D?= =?utf8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?utf8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ui/win32/PeerCast.sln | 52 +++++++++++++++++++++++++++++++++++++ ui/win32/Simple_vp/Simple_vp.vcproj | 3 --- ui/win32/Simple_vp/resource.hm | 4 +++ ui/win32/simple/Simple.vcproj | 6 +++-- ui/win32/simple/resource.hm | 4 +++ 5 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 ui/win32/Simple_vp/resource.hm create mode 100644 ui/win32/simple/resource.hm diff --git a/ui/win32/PeerCast.sln b/ui/win32/PeerCast.sln index 00cd37f..84a2f40 100644 --- 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 diff --git a/ui/win32/Simple_vp/Simple_vp.vcproj b/ui/win32/Simple_vp/Simple_vp.vcproj index 936cb9a..05740a0 100644 --- 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" > diff --git a/ui/win32/Simple_vp/resource.hm b/ui/win32/Simple_vp/resource.hm new file mode 100644 index 0000000..7dfcd3a --- /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 diff --git a/ui/win32/simple/Simple.vcproj b/ui/win32/simple/Simple.vcproj index f5c0f24..ef97372 100644 --- 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" />