Compare commits

..

No commits in common. "adce2983cee6174b64c705b9ac8cc8eccd89e533" and "f650612a63b16c51a0517a9934182f6dca7ad192" have entirely different histories.

2 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
TEMPLATE = lib
TARGET = mobilisis_calc
TARGET = mobility_calc
# CONFIG += staticlib
QMAKE_CXXFLAGS += -std=c++17 -g -O0
@ -11,12 +11,12 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
CONFIG(debug, debug|release) {
win32 {
QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
QMAKE_LFLAGS += -Wl,--out-implib,debug\libmobilisis_calc.a
QMAKE_LFLAGS += -Wl,--out-implib,debug\libmobility_calc.a
}
} else {
win32 {
QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
QMAKE_LFLAGS += -Wl,--out-implib,release\libmobilisis_calc.a
QMAKE_LFLAGS += -Wl,--out-implib,release\libmobility_calc.a
}
}

View File

@ -10,16 +10,16 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobil
INCLUDEPATH += .
unix {
LIBS += -L$$OUT_PWD/../library/ -lmobilisis_calc
LIBS += -L$$OUT_PWD/../library/ -lmobility_calc
}
CONFIG(debug, debug|release) {
win32 {
LIBS += -L$$OUT_PWD/../library/debug/ -lmobilisis_calc
LIBS += -L$$OUT_PWD/../library/debug/ -lmobility_calc
}
} else {
win32 {
LIBS += -L$$OUT_PWD/../library/release/ -lmobilisis_calc
LIBS += -L$$OUT_PWD/../library/release/ -lmobility_calc
}
}