eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

post-merge fixes

Browse Source
This commit is contained in:
tmj-fstate
2017-03-06 19:12:35 +01:00
parent e91e88d4c5
commit 32c554f6b8
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
EU07.cpp
View File

@@ -16,7 +16,6 @@ Authors:
MarcinW, McZapkie, Shaxbee, ABu, nbmx, youBy, Ra, winger, mamut, Q424,
Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
*/
#include "stdafx.h"
#ifdef CAN_I_HAS_LIBPNG
#include <png.h>
@@ -39,6 +38,9 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
#pragma comment( lib, "setupapi.lib" )
#pragma comment( lib, "python27.lib" )
#pragma comment (lib, "dbghelp.lib")
#ifdef CAN_I_HAS_LIBPNG
#pragma comment (lib, "libpng16.lib")
#endif
#ifdef _MSC_VER
#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
@@ -122,9 +124,10 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo
switch( key )
{
#ifdef CAN_I_HAS_LIBPNG
case GLFW_KEY_F11:
make_screenshot();
break;
case GLFW_KEY_F11: {
make_screenshot();
break;
}
#endif
case GLFW_KEY_ESCAPE: {