Merged with changes of MS, some similar bug fixes done in parallel

This commit is contained in:
Klaus Basan
2013-04-30 02:34:15 +02:00
22 changed files with 126 additions and 228 deletions

View File

@@ -7,18 +7,13 @@ TEMPLATE = app
CONFIG += console
CONFIG -= app_bundle
DEPENDPATH += . ../../src/blackmisc
DEPENDPATH += . ../../src
INCLUDEPATH += . ../../src
win32-msvc* {
PRE_TARGETDEPS += ../../lib/blackmisc.lib
LIBS += ../../lib/blackmisc.lib
}
LIBS += -L../../lib -lblackmisc
!win32-msvc* {
PRE_TARGETDEPS += ../../lib/libblackmisc.a
LIBS += ../../lib/libblackmisc.a
}
win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a
DESTDIR = ../../bin