chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed Debug x64.

Browse Source 
Also some minor changes to the installer and Rainmeter.cpp.
This commit is contained in:
Birunthan Mohanathas
2010-10-30 11:21:19 +00:00
parent f430b9ebb2
commit 461f8757c1
21 changed files with 215 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Library.vcproj
View File

@ -136,7 +136,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\x32/Debug/Library.tlb"
TypeLibraryName=".\x64/Debug/Library.tlb"
HeaderFileName=""
/>
<Tool
@ -147,10 +147,10 @@
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\x32/Debug/Library.pch"
AssemblerListingLocation=".\x32/Debug/"
ObjectFile=".\x32/Debug/"
ProgramDataBaseFileName=".\x32/Debug/"
PrecompiledHeaderFile=".\x64/Debug/Library.pch"
AssemblerListingLocation=".\x64/Debug/"
ObjectFile=".\x64/Debug/"
ProgramDataBaseFileName=".\x64/Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@ -169,12 +169,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib Wininet.lib Winmm.lib gdiplus.lib Iphlpapi.lib shlwapi.lib odbc32.lib odbccp32.lib"
OutputFile="../TestBench/x32/Debug/Rainmeter.dll"
OutputFile="../TestBench/x64/Debug/Rainmeter.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\x32/Debug/Rainmeter.pdb"
ImportLibrary=".\x32/Debug/Rainmeter.lib"
ProgramDatabaseFile=".\x64/Debug/Rainmeter.pdb"
ImportLibrary=".\x64/Debug/Rainmeter.lib"
TargetMachine="17"
/>
<Tool

10
Library/Rainmeter.cpp
View File

@ -1688,8 +1688,8 @@ void CRainmeter::CheckSkinVersions()
// Upgrade the skin
CSystem::CopyFiles(strMainSkinsPath + menu[i].name, m_SkinPath);
// TODO: Temporary 'fix': If this was Enigma upgrade the themes too
if (menu[i].name == L"Enigma" || menu[i].name == L"Gnometer")
// TODO: Temporary 'fix': If skin was Illustro upgrade the themes too
if (menu[i].name == L"Illustro")
{
std::wstring strMainThemes = m_Path + L"Themes";
std::wstring strCurrentThemes = GetSettingsPath();
@ -1769,8 +1769,8 @@ int CRainmeter::CompareVersions(std::wstring strA, std::wstring strB)
/*
** CreateDefaultConfigFile
**
** Creates the default Rainmeter.ini file. Gnometer\Bars and Gnometer\Clock configs
** are enabled.
** Creates the default Rainmeter.ini file.
** Illustro\System is enabled.
**
*/
void CRainmeter::CreateDefaultConfigFile(std::wstring strFile)
@ -1789,7 +1789,7 @@ void CRainmeter::CreateDefaultConfigFile(std::wstring strFile)
std::ofstream out(strFile.c_str(), std::ios::out);
if (out)
{
out << std::string("[Rainmeter]\n\n[Gnometer\\Bars]\nActive=1\n\n[Gnometer\\Clock]\nActive=1\n");
out << std::string("[Rainmeter]\n\n[Illustro\\System]\nActive=1\n");
out.close();
}
}