| Revision | cdd1cbf94156f05b667ae716df3dafe2b789ff41 (tree) |
|---|---|
| Time | 2016-10-26 00:00:03 |
| Author | Deskull <desull@user...> |
| Commiter | Deskull |
zlib及びlibpngへの依存設定を試験的に追加。 / add setting for dependency of zlib and libpng.
Hengband_vcs2010/Hengband/Hengband.vcxproj (diff)
src/main-win.c (diff)| @@ -68,13 +68,15 @@ | ||
| 68 | 68 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> |
| 69 | 69 | <CompileAs>CompileAsC</CompileAs> |
| 70 | 70 | <DisableSpecificWarnings>4127;4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> |
| 71 | + <AdditionalIncludeDirectories>C:\local\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
| 71 | 72 | </ClCompile> |
| 72 | 73 | <Link> |
| 73 | - <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| 74 | + <AdditionalDependencies>winmm.lib;wsock32.lib;zlib.lib;libpng16.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
| 74 | 75 | <GenerateDebugInformation>true</GenerateDebugInformation> |
| 75 | 76 | <TargetMachine>MachineX86</TargetMachine> |
| 76 | 77 | <ShowProgress>LinkVerbose</ShowProgress> |
| 77 | 78 | <SubSystem>Windows</SubSystem> |
| 79 | + <AdditionalLibraryDirectories>C:\local\libpng\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
| 78 | 80 | </Link> |
| 79 | 81 | </ItemDefinitionGroup> |
| 80 | 82 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='English-Debug|Win32'"> |
| @@ -79,6 +79,9 @@ | ||
| 79 | 79 | #include <direct.h> |
| 80 | 80 | #include <locale.h> |
| 81 | 81 | #include "z-term.h" |
| 82 | +#include <png.h> | |
| 83 | +#include <pngstruct.h> | |
| 84 | +#include <pnginfo.h> | |
| 82 | 85 | |
| 83 | 86 | /* |
| 84 | 87 | * Extract the "WIN32" flag from the compiler |
| @@ -4320,6 +4323,25 @@ static void process_menus(WORD wCmd) | ||
| 4320 | 4323 | case IDM_OPTIONS_NEW_GRAPHICS_MODE: |
| 4321 | 4324 | { |
| 4322 | 4325 | use_new_gmode = !use_new_gmode; |
| 4326 | + | |
| 4327 | + /* Paranoia */ | |
| 4328 | + if (!inkey_flag) | |
| 4329 | + { | |
| 4330 | + plog("You may not do that right now."); | |
| 4331 | + break; | |
| 4332 | + } | |
| 4333 | + | |
| 4334 | + /* Toggle "arg_graphics" */ | |
| 4335 | + if (arg_graphics != GRAPHICS_HENGBAND) | |
| 4336 | + { | |
| 4337 | + arg_graphics = GRAPHICS_HENGBAND; | |
| 4338 | + | |
| 4339 | + /* React to changes */ | |
| 4340 | + Term_xtra_win_react(); | |
| 4341 | + | |
| 4342 | + /* Hack -- Force redraw */ | |
| 4343 | + Term_key_push(KTRL('R')); | |
| 4344 | + } | |
| 4323 | 4345 | break; |
| 4324 | 4346 | } |
| 4325 | 4347 |
Fork