forked from markus/S_New4
Merge branch 'kall'
This commit is contained in:
commit
77a94bf532
@ -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
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user