Commit c9169e2c authored by Greg Pazo's avatar Greg Pazo

Merge pull request #40 from gilmoskowitz/dmtx-name-delayedmerge

dmtx library name change (delayed merge)
parents 526b8e98 c8f0173f
......@@ -64,7 +64,7 @@ symbian {
TARGET.UID3 = 0xE6F5730D
TARGET.CAPABILITY =
TARGET.EPOCALLOWDLLDATA = 1
addFiles.sources = Dmtx_Library.dll
addFiles.sources = dmtx.dll
addFiles.path = !:/sys/bin
DEPLOYMENT += addFiles
}
......
......@@ -32,7 +32,7 @@ MOC_DIR = tmp
UI_DIR = tmp
QMAKE_LIBDIR = ../../lib $$QMAKE_LIBDIR
LIBS += -lrenderer -lopenrptcommon $$LIBDMTX -lMetaSQL
LIBS += -lrenderer -lopenrptcommon -ldmtx -lMetaSQL
win32-msvc* {
PRE_TARGETDEPS += ../../lib/renderer.$${LIBEXT} \
......
......@@ -30,7 +30,7 @@ OBJECTS_DIR = tmp
UI_DIR = tmp
QMAKE_LIBDIR = ../../lib $$QMAKE_LIBDIR
LIBS += $$LIBDMTX -lopenrptcommon -lMetaSQL
LIBS += -ldmtx -lopenrptcommon -lMetaSQL
HEADERS = openreports.h \
barcodes.h \
......
......@@ -33,7 +33,7 @@ OBJECTS_DIR = tmp
INCLUDEPATH += ../../common ../common ../images
QMAKE_LIBDIR = ../../lib $$QMAKE_LIBDIR
LIBS += -lwrtembed -lopenrptcommon -lrenderer $$LIBDMTX -lMetaSQL
LIBS += -lwrtembed -lopenrptcommon -lrenderer -ldmtx -lMetaSQL
win32-msvc* {
PRE_TARGETDEPS += ../../lib/wrtembed.$${LIBEXT} \
......
......@@ -33,7 +33,7 @@ QT += xml sql widgets printsupport
#VERSION = 0.1.0
QMAKE_LIBDIR = ../../lib $$QMAKE_LIBDIR
LIBS += $$LIBDMTX -lopenrptcommon -lrenderer
LIBS += -ldmtx -lopenrptcommon -lrenderer
#The following line was changed from FORMS to FORMS3 by qt3to4
FORMS += labeleditor.ui \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment