6543/S_New4
1
0
Fork 0
forked from markus/S_New4
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://code.obermui.de:3232/markus/S_New4 into kall

Browse Source
This commit is contained in:
Markus 2022-01-09 01:25:10 +01:00
commit 2357b1262f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/S_New4.pro
View File

@ -1,22 +1,18 @@
QT -= gui QT -= gui







#INCLUDEPATH += -L$${_PRO_FILE_PWD_}\openssl-android-arm64-v8a\include #INCLUDEPATH += -L$${_PRO_FILE_PWD_}\openssl-android-arm64-v8a\include


LIBS += -L$${_PRO_FILE_PWD_}\lib -lssl #LIBS += -L$${_PRO_FILE_PWD_}\lib -lssl
LIBS += -L$${_PRO_FILE_PWD_}\lib -lcrypto #LIBS += -L$${_PRO_FILE_PWD_}\lib -lcrypto
LIBS += -L$${_PRO_FILE_PWD_}\lib -lcurl #LIBS += -L$${_PRO_FILE_PWD_}\lib -lcurl





#Linux: #Linux:
#unix: LIBS += -lcurl unix: LIBS += -lcurl


#Windows #Windows
#win32: LIBS += -L$${_PRO_FILE_PWD_}\curl -lcurl win32: LIBS += -L$${_PRO_FILE_PWD_}\curl -lcurl




CONFIG += c++14 console CONFIG += c++14 console

6
src/parameterManager.cpp
View File

@ -148,8 +148,14 @@ int manageParameter(Settings &settings, int argc, char **argv)
void unterOption_printVersion(Settings &settings) void unterOption_printVersion(Settings &settings)
{ {
std::cout << "Programinfos:" << std::endl std::cout << "Programinfos:" << std::endl
<< " > Build-Datum: " << __DATE__ << std::endl
<< " > Build-Uhrzeit: " << __TIME__ << std::endl
<< " > Program Version: " << settings.version << std::endl << " > Program Version: " << settings.version << std::endl
<< " > Defaults Datei Version: " << settings.defaultFileVersion << std::endl << " > Defaults Datei Version: " << settings.defaultFileVersion << std::endl
#ifdef __MINGW_GCC_VERSION
<< " > MINGW GCC Version: " <<__GNUC__ << "." << __GNUC_MINOR__ << "." << __GNUC_PATCHLEVEL__ << std::endl
#endif

<< " > C++ Standart: "; << " > C++ Standart: ";
if(__cplusplus == 1) std::cout << "C++_Pre_C++98" << std::endl; if(__cplusplus == 1) std::cout << "C++_Pre_C++98" << std::endl;
else if (__cplusplus == 199711) std::cout << "C++98" << std::endl; else if (__cplusplus == 199711) std::cout << "C++98" << std::endl;