diff options
Diffstat (limited to 'Sessions')
| -rw-r--r-- | Sessions/Sessions_10.vcxproj | 24 | ||||
| -rw-r--r-- | Sessions/Src/Main.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Sessions/Sessions_10.vcxproj b/Sessions/Sessions_10.vcxproj index 0462e62..930c088 100644 --- a/Sessions/Sessions_10.vcxproj +++ b/Sessions/Sessions_10.vcxproj @@ -69,15 +69,15 @@ <PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)\$(Configuration) $(Platform)/Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\</IntDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</IgnoreImportLibrary>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</IgnoreImportLibrary>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)\$(Configuration) $(Platform)/Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />
@@ -109,7 +109,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeaderFile>sessions.h</PrecompiledHeaderFile>
</ClCompile>
@@ -120,7 +120,7 @@ <AdditionalOptions>/filealign:0x200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<BaseAddress>0x67100000</BaseAddress>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -144,7 +144,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<PrecompiledHeaderFile>sessions.h</PrecompiledHeaderFile>
</ClCompile>
@@ -155,7 +155,7 @@ <AdditionalOptions>/filealign:0x200 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<BaseAddress>0x67100000</BaseAddress>
- <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -173,11 +173,11 @@ </Midl>
<ClCompile>
<AdditionalOptions> /D "DEBUG" %(AdditionalOptions)</AdditionalOptions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<PrecompiledHeaderFile>sessions.h</PrecompiledHeaderFile>
</ClCompile>
@@ -206,10 +206,10 @@ <ClCompile>
<AdditionalOptions> /D "DEBUG" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>sessions.h</PrecompiledHeaderFile>
</ClCompile>
<ResourceCompile>
diff --git a/Sessions/Src/Main.cpp b/Sessions/Src/Main.cpp index ec13338..47ec1b9 100644 --- a/Sessions/Src/Main.cpp +++ b/Sessions/Src/Main.cpp @@ -549,7 +549,7 @@ int SaveSessionDate() GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDateBuf, DateSize );
TCHAR *szSessionTime = (TCHAR*)mir_alloc((DateSize+TimeSize+5)*sizeof(TCHAR));
- int lenn = _tcslen(szSessionTime);
+ int lenn = (int)_tcslen(szSessionTime);
mir_sntprintf(szSessionTime, lenn, _T("%s - %s"), szTimeBuf, szDateBuf);
char szSessionDate[256];
|