Several fixes for compilation with gcc (doesn't link)

This commit is contained in:
eelke 2017-08-22 12:45:45 +02:00
parent a2f39692a2
commit dd9906dbd8
20 changed files with 379 additions and 262 deletions

View file

@ -4,7 +4,7 @@
#
#-------------------------------------------------
CONFIG += c++11
CONFIG += c++14
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
@ -12,12 +12,13 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
TARGET = pglab
TEMPLATE = app
INCLUDEPATH += C:\prog\include C:\VSproj\boost_1_63_0
INCLUDEPATH += C:\prog\include C:\Prog\boost\include\boost-1_64
DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib
#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib
LIBS += -LC:/MINGW/LIB -LC:/PROG/LIB -lws2_32 -lpq
debug {
LIBS += c:\prog\lib\botand_imp.lib
LIBS += c:/prog/lib/botand_imp.lib
}
release {
@ -139,7 +140,7 @@ FORMS += mainwindow.ui \
RESOURCES += \
resources.qrc
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore