! build fixes for calendar and clock

White-Tiger · Jun 18, 2014 · 593704d · 593704d
1 parent 4cbbd91
commit 593704d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Source/Calendar/Calendar.vcxproj b/Source/Calendar/Calendar.vcxproj
@@ -76,7 +76,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;user32.lib;comctl32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;User32.lib;Shell32.lib;comctl32.lib;</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -100,7 +100,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;user32.lib;comctl32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;User32.lib;Shell32.lib;comctl32.lib;</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;user32.lib;comctl32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;User32.lib;Shell32.lib;comctl32.lib;</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -149,7 +149,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;user32.lib;comctl32.lib;</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;User32.lib;Shell32.lib;comctl32.lib;</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>

diff --git a/Source/Calendar/DeskCalendar.c b/Source/Calendar/DeskCalendar.c
@@ -130,7 +130,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
 		if(ivMonthsPast){
 			SYSTEMTIME st,stnew; MonthCal_GetCurSel(hCal,&st); stnew=st;
 			if(stnew.wMonth<ivMonthsPast){ --stnew.wYear; stnew.wMonth+=12; }
-			stnew.wMonth-=ivMonthsPast;
+			stnew.wMonth-=(short)ivMonthsPast;
 			if(stnew.wMonth>12){ ++stnew.wYear; stnew.wMonth-=12; }  // in case ivMonthsPast is negative
 			MonthCal_SetCurSel(hCal,&stnew);
 			MonthCal_SetCurSel(hCal,&st);

diff --git a/Source/Clock/Win32/Win32.Clock.vcxproj b/Source/Clock/Win32/Win32.Clock.vcxproj
@@ -76,7 +76,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;user32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;User32.lib;Shell32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -100,7 +100,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;user32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;User32.lib;Shell32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;user32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;User32.lib;Shell32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -149,7 +149,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;user32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
+      <AdditionalDependencies>Advapi32.lib;kernel32.lib;Ws2_32.lib;User32.lib;Shell32.lib;Mpr.lib;../../../$(Configuration)/$(Platform)/tClock.lib;ole32.lib;Comdlg32.lib;shlwapi.lib;Version.lib;comctl32.lib;gdi32.lib;shell32.lib;Winmm.lib;Psapi.lib;UxTheme.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>

diff --git a/T-Clock-XPCalendar.cbp b/T-Clock-XPCalendar.cbp
@@ -90,7 +90,8 @@
 			<Add option="/DTCLOCK_LIGHT" />
 		</Compiler>
 		<Linker>
-			<Add library="user32" />
+			<Add library="User32" />
+			<Add library="Shell32" />
 			<Add library="Advapi32" />
 			<Add library="Comctl32" />
 		</Linker>