コミット: ac0feb521502ee41ad1957bd2d6564125b97f740 - ikemen (git)

コミットメタ情報

• リビジョン: ac0feb521502ee41ad1957bd2d6564125b97f740 (tree)
• 日時: 2017-02-21 21:03:14
• 作者: SUEHIRO <supersuehiro@user...>
• コミッター: SUEHIRO

ログメッセージ

libpngの更新

変更サマリ

• modified: lib/alpha/dll/sdlplugin.dll
• modified: src/alpha/sdlplugin/sdlplugin/sdlplugin.cpp
• modified: src/alpha/sdlplugin/sdlplugin/sdlplugin.vcxproj

差分

Binary files a/lib/alpha/dll/sdlplugin.dll and b/lib/alpha/dll/sdlplugin.dll differ

--- a/src/alpha/sdlplugin/sdlplugin/sdlplugin.cpp
+++ b/src/alpha/sdlplugin/sdlplugin/sdlplugin.cpp
@@ -2933,7 +2933,7 @@ void drawQuads(
 			(
 				pers > 1.0
 				? (1-1/(pers*pers))*abs(x3-x4) : (1-(pers*pers))*abs(x1-x2))
-			* (g_h>>6) / (abs(y1-y4) + (g_h>>6)));
+			* (g_h>>5) / (abs(y1-y4) + (g_h>>5)));
 	for(int i = 1; i < n; i++){
 		glTexCoord2f((float)i/n, 1);
 		glVertex2f(x1 + (x2 - x1)*i/n, y1 + (y2 - y1)*i/n);

--- a/src/alpha/sdlplugin/sdlplugin/sdlplugin.vcxproj
+++ b/src/alpha/sdlplugin/sdlplugin/sdlplugin.vcxproj
@@ -69,14 +69,14 @@
       <Optimization>Full</Optimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>D:\d\lib\glew\include;D:\d\lib\SDL2\include;D:\d\lib\SDL2\SDL2_image\include;D:\d\lib\SDL2\SDL2_ttf\include;D:\d\lib\lpng;D:\d\lib\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>D:\d\lib\glew\include;D:\d\lib\SDL2\include;D:\d\lib\SDL2\SDL2_image\include;D:\d\lib\SDL2\SDL2_ttf\include;D:\d\lib\libpng;D:\d\lib\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>sdlplugin.def</ModuleDefinitionFile>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>D:\d\lib\glew\lib\Release\Win32;D:\d\lib\SDL2\lib\x86;D:\d\lib\SDL2\SDL2_image\lib\x86;D:\d\lib\SDL2\SDL2_ttf\lib\x86;D:\d\lib\lpng\projects\visualc71\Win32_LIB_Release;D:\d\lib\zlib\projects\visualc6\Win32_DLL_Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>D:\d\lib\glew\lib\Release\Win32;D:\d\lib\SDL2\lib\x86;D:\d\lib\SDL2\SDL2_image\lib\x86;D:\d\lib\SDL2\SDL2_ttf\lib\x86;D:\d\lib\libpng\projects\visualc71\Win32_LIB_Release;D:\d\lib\zlib\projects\visualc6\Win32_DLL_Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>