Manually merged samples geodetic2ecef and logging due to merge issues

This commit is contained in:
Klaus Basan
2013-04-24 13:12:57 +02:00
parent 472521f281
commit 54d031a479
5 changed files with 55 additions and 66 deletions

View File

@@ -11,23 +11,14 @@ DEPENDPATH += . ../../src
INCLUDEPATH += . ../../src
SOURCES += main.cpp\
SOURCES += *.cpp
win32-msvc* {
PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blackcore.lib
LIBS += -L../../lib -lblackcore -lblackmisc
LIBS += ../../lib/blackmisc.lib \
../../lib/blackcore.lib
}
!win32-msvc* {
PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackcore.a
LIBS += ../../lib/libblackmisc.a \
../../lib/libblackcore.a
}
win32: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
../../lib/blackcore.lib
else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \
../../lib/libblackcore.a
DESTDIR = ../../bin