eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

More projects fixes.

Browse source
This commit is contained in:
eelke 2019-03-27 18:50:58 +01:00
parent 4694b09ba1
commit d7763e83bf
6 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/core.pro
View file

@ -15,9 +15,6 @@ CONFIG += staticlib
error( "Couldn't find the common.pri file!" ) 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. # You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line. # 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. # You can also select to disable deprecated APIs only up to a certain version of Qt.

3
pglab/pglab.pro
View file

@ -184,8 +184,6 @@ RESOURCES += \
QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
LIBS += -Lc:/prog/lib/
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore 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 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 win32:CONFIG(debug, debug|release): LIBS += -lbotand
else:win32:CONFIG(release, debug|release): LIBS += -lbotan else:win32:CONFIG(release, debug|release): LIBS += -lbotan
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a 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-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 else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib

2
pglablib/pglablib.pro
View file

@ -14,8 +14,6 @@ CONFIG += staticlib
error( "Couldn't find the common.pri file!" ) 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. # You can also make your code fail to compile if you use deprecated APIs.
# In order to do so, uncomment the following line. # 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. # You can also select to disable deprecated APIs only up to a certain version of Qt.

19
pgsql/pgsql.pro
View file

@ -16,18 +16,7 @@ TEMPLATE = lib
error( "Couldn't find the common.pri file!" ) 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 += -lws2_32 -llibpq
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
SOURCES += Pgsql_Connection.cpp \ SOURCES += Pgsql_Connection.cpp \
Pgsql_Params.cpp \ Pgsql_Params.cpp \
@ -56,12 +45,6 @@ HEADERS += Pgsql_Connection.h \
Pgsql_ErrorDetails.h \ Pgsql_ErrorDetails.h \
Pgsql_Canceller.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 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 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore

4
tests/PgsqlTests/PgsqlTests.pro
View file

@ -11,10 +11,6 @@ CONFIG += qt
QT += core QT += core
INCLUDEPATH += C:\Prog\include\pgsql
HEADERS += HEADERS +=
SOURCES += main.cpp \ SOURCES += main.cpp \

8
tests/pglabtests/pglabtests.pro
View file

@ -30,13 +30,11 @@ SOURCES += main.cpp \
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../core/release/ -lcore 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 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 INCLUDEPATH += $$PWD/../../core
DEPENDPATH += $$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 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-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/libcore.a