merge

platform/msvc2008/love.vcproj

@@ -94,7 +94,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -4034,6 +4034,10 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\icon.rc"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\love.cpp"
 			>

src/modules/timer/sdl/Timer.cpp

@@ -109,7 +109,7 @@ namespace sdl
 		QueryPerformanceFrequency(&temp);
 		freq = temp.QuadPart;
 		__int64 secs = ticks/freq;
-		__int64 usecs = (ticks%freq)/(freq/1000000.0f);
+		__int64 usecs = static_cast<__int64>((ticks%freq)/(freq/1000000.0f));
 		return secs%86400 + usecs/1000000.0f;
 #else
 		timeval t;