More projects fixes.
This commit is contained in:
parent
4694b09ba1
commit
d7763e83bf
6 changed files with 4 additions and 35 deletions
|
|
@ -15,9 +15,6 @@ CONFIG += staticlib
|
|||
error( "Couldn't find the common.pri file!" )
|
||||
}
|
||||
|
||||
INCLUDEPATH += C:\Prog\include\pgsql
|
||||
|
||||
|
||||
# You can also make your code fail to compile if you use deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
|
|
|
|||
|
|
@ -184,8 +184,6 @@ RESOURCES += \
|
|||
|
||||
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
|
||||
|
||||
LIBS += -Lc:/prog/lib/
|
||||
|
||||
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
|
||||
|
||||
|
|
@ -195,7 +193,6 @@ DEPENDPATH += $$PWD/../core
|
|||
win32:CONFIG(debug, debug|release): LIBS += -lbotand
|
||||
else:win32:CONFIG(release, debug|release): LIBS += -lbotan
|
||||
|
||||
|
||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a
|
||||
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a
|
||||
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ CONFIG += staticlib
|
|||
error( "Couldn't find the common.pri file!" )
|
||||
}
|
||||
|
||||
INCLUDEPATH += C:\Prog\include\pgsql
|
||||
|
||||
# You can also make your code fail to compile if you use deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
|
|
|
|||
|
|
@ -16,18 +16,7 @@ TEMPLATE = lib
|
|||
error( "Couldn't find the common.pri file!" )
|
||||
}
|
||||
|
||||
#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib
|
||||
LIBS += -LC:/PROG/LIB -lws2_32 -llibpq
|
||||
|
||||
debug {
|
||||
#LIBS += c:/prog/lib/botand_imp.lib
|
||||
}
|
||||
|
||||
release {
|
||||
# LIBS += c:\prog\lib\botan.lib
|
||||
}
|
||||
|
||||
#win32:RC_ICONS += pglab.ico
|
||||
LIBS += -lws2_32 -llibpq
|
||||
|
||||
SOURCES += Pgsql_Connection.cpp \
|
||||
Pgsql_Params.cpp \
|
||||
|
|
@ -56,12 +45,6 @@ HEADERS += Pgsql_Connection.h \
|
|||
Pgsql_ErrorDetails.h \
|
||||
Pgsql_Canceller.h
|
||||
|
||||
#FORMS +=
|
||||
|
||||
#RESOURCES += \
|
||||
# resources.qrc
|
||||
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@ CONFIG += qt
|
|||
|
||||
QT += core
|
||||
|
||||
INCLUDEPATH += C:\Prog\include\pgsql
|
||||
|
||||
|
||||
|
||||
HEADERS +=
|
||||
|
||||
SOURCES += main.cpp \
|
||||
|
|
|
|||
|
|
@ -30,13 +30,11 @@ SOURCES += main.cpp \
|
|||
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
|
||||
|
||||
INCLUDEPATH += C:\prog\include \
|
||||
C:\Prog\include\pgsql \
|
||||
C:\VSproj\boost32\include
|
||||
|
||||
INCLUDEPATH += $$PWD/../../core
|
||||
DEPENDPATH += $$PWD/../../core
|
||||
LIBS += c:\prog\lib\botand.lib
|
||||
|
||||
win32:CONFIG(debug, debug|release): LIBS += -lbotand
|
||||
else:win32:CONFIG(release, debug|release): LIBS += -lbotan
|
||||
|
||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/libcore.a
|
||||
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/libcore.a
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue