From e91e88d4c5db8330914e2f06ddc9c275b7a1e0bb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 6 Mar 2017 19:11:09 +0100 Subject: [PATCH] project files cleanup --- EU07.cpp | 9 +++++++-- maszyna.vcxproj | 1 + maszyna.vcxproj.filters | 3 +++ Classes.cpp => old/Classes.cpp | 0 Forth.cpp => old/Forth.cpp | 0 Forth.h => old/Forth.h | 0 Geom.cpp => old/Geom.cpp | 0 Geom.h => old/Geom.h | 0 {McZapkie => old}/Mover.hpp | 0 {McZapkie => old}/Oerlikon_ESt.hpp | 0 {McZapkie => old}/Oerlikon_ESt.pas | 0 QueryParserComp.hpp => old/QueryParserComp.hpp | 0 QueryParserComp.pas => old/QueryParserComp.pas | 0 {McZapkie => old}/Unit1.pas | 0 {McZapkie => old}/_Mover.hpp | 0 {McZapkie => old}/_mover.pas | 0 {McZapkie => old}/friction.hpp | 0 {McZapkie => old}/friction.pas | 0 {McZapkie => old}/hamulce.hpp | 0 {McZapkie => old}/hamulce.pas | 0 {McZapkie => old}/klasy_ham.pas | 0 {McZapkie => old}/mctools.hpp | 0 {McZapkie => old}/mctools.pas | 0 {McZapkie => old}/mtable.hpp | 0 {McZapkie => old}/mtable.pas | 0 {McZapkie => old}/unit2.pas | 0 26 files changed, 11 insertions(+), 2 deletions(-) rename Classes.cpp => old/Classes.cpp (100%) rename Forth.cpp => old/Forth.cpp (100%) rename Forth.h => old/Forth.h (100%) rename Geom.cpp => old/Geom.cpp (100%) rename Geom.h => old/Geom.h (100%) rename {McZapkie => old}/Mover.hpp (100%) rename {McZapkie => old}/Oerlikon_ESt.hpp (100%) rename {McZapkie => old}/Oerlikon_ESt.pas (100%) rename QueryParserComp.hpp => old/QueryParserComp.hpp (100%) rename QueryParserComp.pas => old/QueryParserComp.pas (100%) rename {McZapkie => old}/Unit1.pas (100%) rename {McZapkie => old}/_Mover.hpp (100%) rename {McZapkie => old}/_mover.pas (100%) rename {McZapkie => old}/friction.hpp (100%) rename {McZapkie => old}/friction.pas (100%) rename {McZapkie => old}/hamulce.hpp (100%) rename {McZapkie => old}/hamulce.pas (100%) rename {McZapkie => old}/klasy_ham.pas (100%) rename {McZapkie => old}/mctools.hpp (100%) rename {McZapkie => old}/mctools.pas (100%) rename {McZapkie => old}/mtable.hpp (100%) rename {McZapkie => old}/mtable.pas (100%) rename {McZapkie => old}/unit2.pas (100%) diff --git a/EU07.cpp b/EU07.cpp index 7b795f64..62b1b660 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -18,8 +18,9 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others */ #include "stdafx.h" +#ifdef CAN_I_HAS_LIBPNG #include -#include +#endif #include "Globals.h" #include "Logs.h" @@ -45,7 +46,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others TWorld World; -void screenshot_save_thread(char *img) +#ifdef CAN_I_HAS_LIBPNG +void screenshot_save_thread( char *img ) { png_image png; memset(&png, 0, sizeof(png_image)); @@ -83,6 +85,7 @@ void make_screenshot() std::thread t(screenshot_save_thread, img); t.detach(); } +#endif void window_resize_callback(GLFWwindow *window, int w, int h) { @@ -118,9 +121,11 @@ 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; +#endif case GLFW_KEY_ESCAPE: { if( ( DebugModeFlag ) //[Esc] pauzuje tylko bez Debugmode diff --git a/maszyna.vcxproj b/maszyna.vcxproj index dae5517e..c212cd6b 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -156,6 +156,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 147a4d11..433c4b88 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -377,6 +377,9 @@ Header Files + + Header Files + diff --git a/Classes.cpp b/old/Classes.cpp similarity index 100% rename from Classes.cpp rename to old/Classes.cpp diff --git a/Forth.cpp b/old/Forth.cpp similarity index 100% rename from Forth.cpp rename to old/Forth.cpp diff --git a/Forth.h b/old/Forth.h similarity index 100% rename from Forth.h rename to old/Forth.h diff --git a/Geom.cpp b/old/Geom.cpp similarity index 100% rename from Geom.cpp rename to old/Geom.cpp diff --git a/Geom.h b/old/Geom.h similarity index 100% rename from Geom.h rename to old/Geom.h diff --git a/McZapkie/Mover.hpp b/old/Mover.hpp similarity index 100% rename from McZapkie/Mover.hpp rename to old/Mover.hpp diff --git a/McZapkie/Oerlikon_ESt.hpp b/old/Oerlikon_ESt.hpp similarity index 100% rename from McZapkie/Oerlikon_ESt.hpp rename to old/Oerlikon_ESt.hpp diff --git a/McZapkie/Oerlikon_ESt.pas b/old/Oerlikon_ESt.pas similarity index 100% rename from McZapkie/Oerlikon_ESt.pas rename to old/Oerlikon_ESt.pas diff --git a/QueryParserComp.hpp b/old/QueryParserComp.hpp similarity index 100% rename from QueryParserComp.hpp rename to old/QueryParserComp.hpp diff --git a/QueryParserComp.pas b/old/QueryParserComp.pas similarity index 100% rename from QueryParserComp.pas rename to old/QueryParserComp.pas diff --git a/McZapkie/Unit1.pas b/old/Unit1.pas similarity index 100% rename from McZapkie/Unit1.pas rename to old/Unit1.pas diff --git a/McZapkie/_Mover.hpp b/old/_Mover.hpp similarity index 100% rename from McZapkie/_Mover.hpp rename to old/_Mover.hpp diff --git a/McZapkie/_mover.pas b/old/_mover.pas similarity index 100% rename from McZapkie/_mover.pas rename to old/_mover.pas diff --git a/McZapkie/friction.hpp b/old/friction.hpp similarity index 100% rename from McZapkie/friction.hpp rename to old/friction.hpp diff --git a/McZapkie/friction.pas b/old/friction.pas similarity index 100% rename from McZapkie/friction.pas rename to old/friction.pas diff --git a/McZapkie/hamulce.hpp b/old/hamulce.hpp similarity index 100% rename from McZapkie/hamulce.hpp rename to old/hamulce.hpp diff --git a/McZapkie/hamulce.pas b/old/hamulce.pas similarity index 100% rename from McZapkie/hamulce.pas rename to old/hamulce.pas diff --git a/McZapkie/klasy_ham.pas b/old/klasy_ham.pas similarity index 100% rename from McZapkie/klasy_ham.pas rename to old/klasy_ham.pas diff --git a/McZapkie/mctools.hpp b/old/mctools.hpp similarity index 100% rename from McZapkie/mctools.hpp rename to old/mctools.hpp diff --git a/McZapkie/mctools.pas b/old/mctools.pas similarity index 100% rename from McZapkie/mctools.pas rename to old/mctools.pas diff --git a/McZapkie/mtable.hpp b/old/mtable.hpp similarity index 100% rename from McZapkie/mtable.hpp rename to old/mtable.hpp diff --git a/McZapkie/mtable.pas b/old/mtable.pas similarity index 100% rename from McZapkie/mtable.pas rename to old/mtable.pas diff --git a/McZapkie/unit2.pas b/old/unit2.pas similarity index 100% rename from McZapkie/unit2.pas rename to old/unit2.pas