diff options
| -rw-r--r-- | plugins/wmpa/wmpa.vcxproj | 182 | ||||
| -rw-r--r-- | plugins/wmpa/wmpa.vcxproj.filters | 62 | ||||
| -rw-r--r-- | win32/xchat.props | 4 | ||||
| -rw-r--r-- | win32/xchat.sln | 5 |
4 files changed, 77 insertions, 176 deletions
diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj index 919c2c00..b231d0b0 100644 --- a/plugins/wmpa/wmpa.vcxproj +++ b/plugins/wmpa/wmpa.vcxproj @@ -5,164 +5,58 @@ <Configuration>Release</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <SccProjectName /> - <SccLocalPath /> - <Keyword>MFCProj</Keyword> + <ProjectGuid>{E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>wmpa</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseOfMfc>Dynamic</UseOfMfc> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>WDK7</PlatformToolset> <UseOfMfc>Dynamic</UseOfMfc> - <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" /> + <Import Project="..\..\win32\xchat.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>.\Release\</OutDir> - <IntDir>.\Release\</IntDir> - <LinkIncremental>false</LinkIncremental> - <TargetName>xcwmpa</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>.\Release\</OutDir> - <IntDir>.\Release\</IntDir> <LinkIncremental>false</LinkIncremental> <TargetName>xcwmpa</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <StringPooling>true</StringPooling> - <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level1</WarningLevel> + <PrecompiledHeader>Create</PrecompiledHeader> <Optimization>MaxSpeed</Optimization> - <SuppressStartupBanner>true</SuppressStartupBanner> - <WarningLevel>Level3</WarningLevel> - <AdditionalIncludeDirectories>c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\mfc42;c:\WinDDK\7600.16385.1\inc\ddk;c:\WinDDK\7600.16385.1\inc\api\dao360</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;_AFXDLL;_AFX_NO_DAO_SUPPORT</PreprocessorDefinitions> - <AssemblerListingLocation>.\Release\</AssemblerListingLocation> - <PrecompiledHeaderOutputFile>.\Release\wmpa.pch</PrecompiledHeaderOutputFile> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> - <ObjectFileName>.\Release\</ObjectFileName> - <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WMPA_EXPORTS;_AFXDLL;_AFX_NO_DAO_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MultiProcessorCompilation>false</MultiProcessorCompilation> </ClCompile> - <Midl> - <SuppressStartupBanner>true</SuppressStartupBanner> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <TypeLibraryName>.\Release\wmpa.tlb</TypeLibraryName> - <MkTypLibCompatible>true</MkTypLibCompatible> - <TargetEnvironment>Win32</TargetEnvironment> - </Midl> - <ResourceCompile> - <Culture>0x0409</Culture> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>.\Release\wmpa.bsc</OutputFile> - </Bscmake> <Link> - <SuppressStartupBanner>true</SuppressStartupBanner> - <LinkDLL>true</LinkDLL> <SubSystem>Windows</SubSystem> - <OutputFile>.\Release\xcwmpa.dll</OutputFile> - <ImportLibrary>.\Release\wmpa.lib</ImportLibrary> - <ModuleDefinitionFile>.\wmpa.def</ModuleDefinitionFile> - <AdditionalLibraryDirectories>c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Mfc\i386;c:\WinDDK\7600.16385.1\lib\ATL\i386</AdditionalLibraryDirectories> - <AdditionalDependencies>msvcrt_winxp.obj</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <ModuleDefinitionFile>wmpa.def</ModuleDefinitionFile> </Link> - <CustomBuildStep> - <Command> - </Command> - <Outputs> - </Outputs> - <Message> - </Message> - </CustomBuildStep> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <StringPooling>true</StringPooling> - <FunctionLevelLinking>true</FunctionLevelLinking> - <Optimization>MaxSpeed</Optimization> - <SuppressStartupBanner>true</SuppressStartupBanner> - <WarningLevel>Level3</WarningLevel> - <AdditionalIncludeDirectories>c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\mfc42;c:\WinDDK\7600.16385.1\inc\ddk;c:\WinDDK\7600.16385.1\inc\api\dao360</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;_AFXDLL;_AFX_NO_DAO_SUPPORT</PreprocessorDefinitions> - <AssemblerListingLocation>.\Release\</AssemblerListingLocation> - <PrecompiledHeaderOutputFile>.\Release\wmpa.pch</PrecompiledHeaderOutputFile> - <PrecompiledHeader>Use</PrecompiledHeader> - <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> - <ObjectFileName>.\Release\</ObjectFileName> - <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName> - </ClCompile> <Midl> - <SuppressStartupBanner>true</SuppressStartupBanner> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <TypeLibraryName>.\Release\wmpa.tlb</TypeLibraryName> <MkTypLibCompatible>true</MkTypLibCompatible> - <TargetEnvironment>X64</TargetEnvironment> </Midl> - <ResourceCompile> - <Culture>0x0409</Culture> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ResourceCompile> - <Bscmake> - <SuppressStartupBanner>true</SuppressStartupBanner> - <OutputFile>.\Release\wmpa.bsc</OutputFile> - </Bscmake> - <Link> - <SuppressStartupBanner>true</SuppressStartupBanner> - <LinkDLL>true</LinkDLL> - <SubSystem>Windows</SubSystem> - <OutputFile>.\Release\xcwmpa.dll</OutputFile> - <ImportLibrary>.\Release\wmpa.lib</ImportLibrary> - <ModuleDefinitionFile>.\wmpa.def</ModuleDefinitionFile> - <AdditionalLibraryDirectories>c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Mfc\amd64;c:\WinDDK\7600.16385.1\lib\ATL\amd64</AdditionalLibraryDirectories> - <AdditionalDependencies>msvcrt_win2003.obj</AdditionalDependencies> - </Link> - <CustomBuildStep> - <Command> - </Command> - <Outputs> - </Outputs> - <Message> - </Message> - </CustomBuildStep> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="StdAfx.cpp"> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> - <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">stdafx.h</PrecompiledHeaderFile> - <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile> - </ClCompile> + <ClCompile Include="StdAfx.cpp" /> <ClCompile Include="wmpa.cpp" /> - <ClCompile Include="WMPADialog.cpp" /> + <ClCompile Include="wmpadialog.cpp" /> <ClCompile Include="wmpcdrom.cpp" /> <ClCompile Include="wmpcdromcollection.cpp" /> <ClCompile Include="wmpclosedcaption.cpp" /> @@ -183,29 +77,10 @@ <ClCompile Include="xchat-plugin.cpp" /> </ItemGroup> <ItemGroup> - <CustomBuild Include="wmpa.def" /> - <CustomBuild Include="res\wmpa.rc2"> - <FileType>RC</FileType> - </CustomBuild> - <CustomBuild Include="wmpa.ico" /> - <CustomBuild Include="ReadMe.txt" /> - </ItemGroup> - <ItemGroup> - <Midl Include="wmpa.odl"> - <TargetEnvironment Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Win32</TargetEnvironment> - </Midl> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="wmpa.rc"> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Resource.h" /> + <ClInclude Include="resource.h" /> <ClInclude Include="StdAfx.h" /> <ClInclude Include="wmpa.h" /> - <ClInclude Include="WMPADIALOG.h" /> + <ClInclude Include="wmpadialog.h" /> <ClInclude Include="wmpcdrom.h" /> <ClInclude Include="wmpcdromcollection.h" /> <ClInclude Include="wmpclosedcaption.h" /> @@ -225,6 +100,19 @@ <ClInclude Include="wmpstringcollection.h" /> <ClInclude Include="xchat-plugin.h" /> </ItemGroup> + <ItemGroup> + <None Include="ReadMe.txt" /> + <None Include="res\wmpa.rc2" /> + <None Include="wmpa.aps" /> + <None Include="wmpa.def" /> + <None Include="wmpa.ico" /> + </ItemGroup> + <ItemGroup> + <Midl Include="wmpa.odl" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="wmpa.rc" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/plugins/wmpa/wmpa.vcxproj.filters b/plugins/wmpa/wmpa.vcxproj.filters index 6962f46e..2be9d82f 100644 --- a/plugins/wmpa/wmpa.vcxproj.filters +++ b/plugins/wmpa/wmpa.vcxproj.filters @@ -2,16 +2,19 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{3206fd00-efdb-4bca-9740-9708bd405701}</UniqueIdentifier> - <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{17e13eb2-1243-4ff2-9532-1d6dab0bfef9}</UniqueIdentifier> - <Extensions>h;hpp;hxx;hm;inl</Extensions> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> </Filter> <Filter Include="Resource Files"> - <UniqueIdentifier>{a1d9cf8c-f0bb-4a19-bfff-5223276e650a}</UniqueIdentifier> - <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + <Filter Include="Resource Files\res"> + <UniqueIdentifier>{c54ddc93-06ab-4a74-854a-9ec976b7bfd0}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -21,7 +24,7 @@ <ClCompile Include="wmpa.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="WMPADialog.cpp"> + <ClCompile Include="wmpadialog.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="wmpcdrom.cpp"> @@ -80,17 +83,7 @@ </ClCompile> </ItemGroup> <ItemGroup> - <Midl Include="wmpa.odl"> - <Filter>Source Files</Filter> - </Midl> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="wmpa.rc"> - <Filter>Source Files</Filter> - </ResourceCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Resource.h"> + <ClInclude Include="resource.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="StdAfx.h"> @@ -99,7 +92,7 @@ <ClInclude Include="wmpa.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="WMPADIALOG.h"> + <ClInclude Include="wmpadialog.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="wmpcdrom.h"> @@ -158,15 +151,30 @@ </ClInclude> </ItemGroup> <ItemGroup> - <CustomBuild Include="wmpa.def"> - <Filter>Source Files</Filter> - </CustomBuild> - <CustomBuild Include="res\wmpa.rc2"> + <None Include="wmpa.aps"> <Filter>Resource Files</Filter> - </CustomBuild> - <CustomBuild Include="wmpa.ico"> + </None> + <None Include="wmpa.def"> <Filter>Resource Files</Filter> - </CustomBuild> - <CustomBuild Include="ReadMe.txt" /> + </None> + <None Include="wmpa.ico"> + <Filter>Resource Files</Filter> + </None> + <None Include="ReadMe.txt"> + <Filter>Resource Files</Filter> + </None> + <None Include="res\wmpa.rc2"> + <Filter>Resource Files\res</Filter> + </None> + </ItemGroup> + <ItemGroup> + <Midl Include="wmpa.odl"> + <Filter>Resource Files</Filter> + </Midl> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="wmpa.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> </ItemGroup> </Project> \ No newline at end of file diff --git a/win32/xchat.props b/win32/xchat.props index 32ed807d..1611bc9e 100644 --- a/win32/xchat.props +++ b/win32/xchat.props @@ -2,8 +2,8 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros"> - <!-- SPECIFY YOUR ROOT DEPENDENCY DIRECTORY ROOT HERE --> - <YourDepsPath>c:\mozilla-build\xchat deps</YourDepsPath> + <!-- SPECIFY YOUR DEPENDENCY DIRECTORIES HERE --> + <YourDepsPath>c:\mozilla-build\deps path</YourDepsPath> <YourGendefPath>c:\mozilla-build\gendef path</YourGendefPath> <YourTclPath>c:\mozilla-build\tcl path</YourTclPath> <YourPerl512Path>c:\mozilla-build\perl512 path</YourPerl512Path> diff --git a/win32/xchat.sln b/win32/xchat.sln index ecb1f859..c6a84b42 100644 --- a/win32/xchat.sln +++ b/win32/xchat.sln @@ -82,6 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xsasl", "..\plugins\xsasl\x EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xtray", "..\plugins\xtray\xtray.vcxproj", "{3024CF36-85E5-4E00-9608-7002E2C7EF14}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpa", "..\plugins\wmpa\wmpa.vcxproj", "{E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 @@ -133,6 +135,8 @@ Global {18871EBA-AC85-4652-8919-EB8064B9A714}.Release|Win32.Build.0 = Release|Win32 {3024CF36-85E5-4E00-9608-7002E2C7EF14}.Release|Win32.ActiveCfg = Release|Win32 {3024CF36-85E5-4E00-9608-7002E2C7EF14}.Release|Win32.Build.0 = Release|Win32 + {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}.Release|Win32.ActiveCfg = Release|Win32 + {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -155,6 +159,7 @@ Global {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {18871EBA-AC85-4652-8919-EB8064B9A714} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {3024CF36-85E5-4E00-9608-7002E2C7EF14} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} + {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {2773666A-8CFC-4533-A043-EAD59F16A1C7} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {987E9374-98A1-44BA-946F-D3472D7A7055} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} |