mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
Structural changes and updates from tgotic
This commit is contained in:
hooper114
parent
7fa4b32c1d
commit
1695eae7dd
@ -23,7 +23,9 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "common.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
static char *C25MatrixTable[10] = {"113311", "311131", "131131", "331111", "113131", "313111",
|
||||
"133111", "111331", "311311", "131311"};
|
||||
|
||||
@ -55,7 +55,7 @@ all: $(DLL) $(STATLIB)
|
||||
|
||||
$(DLL):$(DLL_OBJ)
|
||||
@echo Linking $@...
|
||||
o2dll.sh -o $@ $(DLL_OBJ) $(LIBS) #-version-info 2:2:0 -version-number 2:2:0
|
||||
o2dll.sh -o $@ $(DLL_OBJ) $(LIBS)
|
||||
|
||||
$(STATLIB): $(LIB_OBJ)
|
||||
@echo Linking $@...
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
symbol->option_2 is used to adjust the width of the resulting symbol (i.e. the
|
||||
number of codeword columns not including row start and end data) */
|
||||
|
||||
/* @(#) $Id: pdf417.c,v 1.15 2009/10/06 19:31:43 hooper114 Exp $ */
|
||||
/* @(#) $Id: pdf417.c,v 1.16 2009/11/17 22:36:04 hooper114 Exp $ */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@ -294,10 +294,8 @@ void textprocess(int *chainemc, int *mclength, char chaine[], int start, int len
|
||||
wnet++;
|
||||
}
|
||||
/* Now translate the string chainet into codewords */
|
||||
if (block > 0) {
|
||||
chainemc[*(mclength)] = 900;
|
||||
*(mclength) = *(mclength) + 1;
|
||||
}
|
||||
|
||||
for(j = 0; j < wnet; j+= 2) {
|
||||
int cw_number;
|
||||
|
||||
@ -157,7 +157,7 @@ int estimate_binary_length(char mode[], int length, int gs1)
|
||||
return count;
|
||||
}
|
||||
|
||||
void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1)
|
||||
void qr_binary(int datastream[], int version, int target_binlen, char mode[], int jisdata[], int length, int gs1, int est_binlen)
|
||||
{
|
||||
/* Convert input data to a binary stream and add padding */
|
||||
int position = 0, debug = 0;
|
||||
@ -167,9 +167,9 @@ void qr_binary(int datastream[], int version, int target_binlen, char mode[], in
|
||||
int toggle, percent;
|
||||
|
||||
#ifndef _MSC_VER
|
||||
char binary[target_binlen * 8];
|
||||
char binary[est_binlen + 12];
|
||||
#else
|
||||
char* binary = (char *)_alloca(target_binlen * 8);
|
||||
char* binary = (char *)_alloca(est_binlen + 12);
|
||||
#endif
|
||||
strcpy(binary, "");
|
||||
|
||||
@ -1241,7 +1241,7 @@ int qr_code(struct zint_symbol *symbol, unsigned char source[], int length)
|
||||
int* fullstream = (int *)_alloca((qr_total_codewords[version - 1] + 1) * sizeof(int));
|
||||
#endif
|
||||
|
||||
qr_binary(datastream, version, target_binlen, mode, jisdata, length, gs1);
|
||||
qr_binary(datastream, version, target_binlen, mode, jisdata, length, gs1, est_binlen);
|
||||
add_ecc(fullstream, datastream, version, target_binlen, blocks);
|
||||
|
||||
size = qr_sizes[version - 1];
|
||||
|
||||
@ -12,7 +12,7 @@ TARGET = QtZint
|
||||
INCLUDEPATH += ../backend
|
||||
|
||||
#EDIT THIS !!!!
|
||||
DEFINES += NO_PNG NO_QR ZINT_VERSION=\"2.1.3\"
|
||||
DEFINES += NO_PNG NO_QR ZINT_VERSION="2.3.0"
|
||||
|
||||
!contains(DEFINES, NO_PNG) {
|
||||
SOURCES += ../backend/png.c
|
||||
@ -97,7 +97,7 @@ SOURCES += ../backend/2of5.c \
|
||||
../backend/code1.c \
|
||||
qzint.cpp
|
||||
|
||||
VERSION = 2.1.3
|
||||
VERSION = 2.3.0
|
||||
|
||||
#DESTDIR = .
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
ZINT_VERSION:=-DZINT_VERSION=\"2.3.0\"
|
||||
|
||||
CC := gcc
|
||||
CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall
|
||||
CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
|
||||
prefix := /mingw
|
||||
bindir := $(prefix)/bin
|
||||
DESTDIR :=
|
||||
@ -20,10 +20,10 @@ all: zint zint_static
|
||||
windres -O coff --input-format=rc -i $< -o $@
|
||||
|
||||
zint: main.c zint.res
|
||||
$(CC) $(CFLAGS) -DZINT_DLL -DQRENCODE_DLL -DPNG_DLL -DZLIB_DLL $(ZINT_VERSION) $? zint.res -o $@ -lzint
|
||||
$(CC) $(CFLAGS) -DZINT_DLL -DPNG_DLL -DZLIB_DLL $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint
|
||||
|
||||
zint_static: main.c zint.res
|
||||
$(CC) -static $(CFLAGS) $(ZINT_VERSION) $? zint.res -o $@ -lzint -lqrencode -lpng -lz
|
||||
$(CC) -static $(CFLAGS) $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint -lpng -lz
|
||||
|
||||
.PHONY: install uninstall clean dist
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@ VS_VERSION_INFO VERSIONINFO
|
||||
#else
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
#endif
|
||||
FILEVERSION 2,1,3,0
|
||||
PRODUCTVERSION 2,1,3,0
|
||||
FILEVERSION 2,3,0,0
|
||||
PRODUCTVERSION 2,3,0,0
|
||||
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS VS_FF_DEBUG
|
||||
@ -24,13 +24,13 @@ BEGIN
|
||||
BLOCK "040904E4"
|
||||
//language ID = U.S. English, char set = Windows, Multilingual
|
||||
BEGIN
|
||||
VALUE "FileDescription", "libzint barcode library\0"
|
||||
VALUE "FileVersion", "2.1.3.0\0"
|
||||
VALUE "FileDescription", "zint barcode generator\0"
|
||||
VALUE "FileVersion", "2.3.0.0\0"
|
||||
VALUE "InternalName", "zint.exe\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra\0"
|
||||
VALUE "OriginalFilename", "zint.exe\0"
|
||||
VALUE "ProductName", "libzint\0"
|
||||
VALUE "ProductVersion", "2.1.3.0\0"
|
||||
VALUE "ProductName", "zint\0"
|
||||
VALUE "ProductVersion", "2.3.0.0\0"
|
||||
VALUE "License", "GNU General Public License version 3\0"
|
||||
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
|
||||
END
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||
***************************************************************************/
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include <QApplication>
|
||||
#include "mainwindow.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication app(argc, argv);
|
||||
Q_INIT_RESOURCE(resources);
|
||||
QApplication app(argc, argv);
|
||||
MainWindow w;
|
||||
w.show();
|
||||
return app.exec();
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
<ui version="4.0">
|
||||
<class>mainWindow</class>
|
||||
<widget class="QWidget" name="mainWindow">
|
||||
<property name="windowModality">
|
||||
<enum>Qt::NonModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@ -10,10 +13,16 @@
|
||||
<height>711</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>749</width>
|
||||
<height>711</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>800</width>
|
||||
<height>800</height>
|
||||
<width>749</width>
|
||||
<height>711</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -21,10 +30,10 @@
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/zico.png</normaloff>:/zico.png</iconset>
|
||||
<normaloff>:/images/zico.png</normaloff>:/images/zico.png</iconset>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-image: url(:/blueback.png);</string>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<item>
|
||||
@ -50,7 +59,19 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QToolButton" name="toolButton_5">
|
||||
<widget class="QToolButton" name="btnZoomOut">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Zoom out</string>
|
||||
</property>
|
||||
@ -59,7 +80,7 @@
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/zoomout.png</normaloff>:/zoomout.png</iconset>
|
||||
<normaloff>:/images/zoomout.png</normaloff>:/images/zoomout.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
@ -74,6 +95,9 @@
|
||||
<property name="toolTip">
|
||||
<string>Adjust zoom</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>50</number>
|
||||
</property>
|
||||
@ -95,13 +119,25 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QToolButton" name="toolButton_4">
|
||||
<widget class="QToolButton" name="btnZoomIn">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Zoom in</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/zoomin.png</normaloff>:/zoomin.png</iconset>
|
||||
<normaloff>:/images/zoomin.png</normaloff>:/images/zoomin.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
@ -112,13 +148,28 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QToolButton" name="toolButton">
|
||||
<widget class="QToolButton" name="btnRotateLeft">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Rotate anti-clockwise</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/rotateleft.png</normaloff>:/rotateleft.png</iconset>
|
||||
<normaloff>:/images/rotateleft.png</normaloff>:/images/rotateleft.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
@ -133,22 +184,46 @@
|
||||
<property name="toolTip">
|
||||
<string>Adjust Rotation</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>360</number>
|
||||
</property>
|
||||
<property name="pageStep">
|
||||
<number>15</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="tickPosition">
|
||||
<enum>QSlider::TicksBelow</enum>
|
||||
</property>
|
||||
<property name="tickInterval">
|
||||
<number>90</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QToolButton" name="toolButton_2">
|
||||
<widget class="QToolButton" name="btnRotatRight">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>28</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Rotate clockwise</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/rotateright.png</normaloff>:/rotateright.png</iconset>
|
||||
<normaloff>:/images/rotateright.png</normaloff>:/images/rotateright.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
@ -391,7 +466,7 @@
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;">
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Your Data Here!</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
@ -704,80 +779,15 @@ p, li { white-space: pre-wrap; }
|
||||
<tabstop>btnSave</tabstop>
|
||||
<tabstop>btnExit</tabstop>
|
||||
<tabstop>view</tabstop>
|
||||
<tabstop>toolButton_5</tabstop>
|
||||
<tabstop>btnZoomOut</tabstop>
|
||||
<tabstop>scaleSlider</tabstop>
|
||||
<tabstop>toolButton_4</tabstop>
|
||||
<tabstop>toolButton</tabstop>
|
||||
<tabstop>btnZoomIn</tabstop>
|
||||
<tabstop>btnRotateLeft</tabstop>
|
||||
<tabstop>rotateSlider</tabstop>
|
||||
<tabstop>toolButton_2</tabstop>
|
||||
<tabstop>btnRotatRight</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="resources.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>toolButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>rotateSlider</receiver>
|
||||
<slot>subtractStep()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>29</x>
|
||||
<y>265</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>76</x>
|
||||
<y>265</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton_2</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>rotateSlider</receiver>
|
||||
<slot>addStep()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>491</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>431</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton_4</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>scaleSlider</receiver>
|
||||
<slot>addStep()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>532</x>
|
||||
<y>231</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>528</x>
|
||||
<y>191</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>toolButton_5</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>scaleSlider</receiver>
|
||||
<slot>subtractStep()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>530</x>
|
||||
<y>56</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>530</x>
|
||||
<y>94</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@ -132,6 +132,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
|
||||
connect(btnMoreData, SIGNAL(clicked( bool )), SLOT(open_data_dialog()));
|
||||
connect(btnSequence, SIGNAL(clicked( bool )), SLOT(open_sequence_dialog()));
|
||||
connect(chkHRTHide, SIGNAL(stateChanged( int )), SLOT(update_preview()));
|
||||
connect(btnZoomIn, SIGNAL(clicked(void)), SLOT(zoomIn(void)));
|
||||
connect(btnZoomOut, SIGNAL(clicked(void)), SLOT(zoomOut(void)));
|
||||
connect(btnRotateLeft, SIGNAL(clicked(void)), SLOT(rotateLeft(void)));
|
||||
connect(btnRotatRight, SIGNAL(clicked(void)), SLOT(rotateRight(void)));
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow()
|
||||
@ -848,4 +852,23 @@ void MainWindow::update_preview()
|
||||
view->scene()->update();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
MainWindow::zoomIn(void)
|
||||
{
|
||||
scaleSlider->setValue(scaleSlider->value() + scaleSlider->singleStep());
|
||||
}
|
||||
void
|
||||
MainWindow::zoomOut(void)
|
||||
{
|
||||
scaleSlider->setValue(scaleSlider->value() - scaleSlider->singleStep());
|
||||
}
|
||||
void
|
||||
MainWindow::rotateLeft(void)
|
||||
{
|
||||
rotateSlider->setValue(rotateSlider->value() - rotateSlider->singleStep());
|
||||
}
|
||||
void
|
||||
MainWindow::rotateRight(void)
|
||||
{
|
||||
rotateSlider->setValue(rotateSlider->value() + rotateSlider->singleStep());
|
||||
}
|
||||
|
||||
@ -118,6 +118,10 @@ public slots:
|
||||
void maxi_primary();
|
||||
void change_print_scale();
|
||||
void scaleRotate();
|
||||
void zoomIn(void);
|
||||
void zoomOut(void);
|
||||
void rotateLeft(void);
|
||||
void rotateRight(void);
|
||||
|
||||
private slots:
|
||||
bool save();
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource prefix="/">
|
||||
<file>zoomin.png</file>
|
||||
<file>zoomout.png</file>
|
||||
<file>rotateleft.png</file>
|
||||
<file>rotateright.png</file>
|
||||
<file>zico.png</file>
|
||||
<qresource>
|
||||
<file>images/zoomout.png</file>
|
||||
<file>images/rotateleft.png</file>
|
||||
<file>images/rotateright.png</file>
|
||||
<file>images/zico.png</file>
|
||||
<file>images/zoomin.png</file>
|
||||
<file>grpAztec.ui</file>
|
||||
<file>grpC39.ui</file>
|
||||
<file>grpDM.ui</file>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="windows-1250"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Version="9,00"
|
||||
Name="libzint"
|
||||
ProjectGUID="{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}"
|
||||
RootNamespace="libzint"
|
||||
ProjectGUID="{5C08DC40-8F7D-475E-AA3C-814DED735A4B}"
|
||||
RootNamespace="libzint_png_qr"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="196613"
|
||||
>
|
||||
@ -41,8 +41,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.1.3\"";BUILD_ZINT_DLL;NO_PNG;NO_QR"
|
||||
AdditionalIncludeDirectories="d:\opt\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -68,9 +68,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="libpng13d.lib zlib1d.lib"
|
||||
OutputFile="$(OutDir)\zintd.dll"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories=""
|
||||
AdditionalLibraryDirectories="d:\opt\lib"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
@ -124,7 +125,8 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="false"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.1.3\"";BUILD_ZINT_DLL;NO_PNG;NO_QR"
|
||||
AdditionalIncludeDirectories="d:\opt\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
@ -149,8 +151,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
LinkLibraryDependencies="false"
|
||||
AdditionalDependencies="libpng13.lib zlib1.lib"
|
||||
OutputFile="$(OutDir)\zint.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="d:\opt\lib"
|
||||
GenerateDebugInformation="false"
|
||||
SubSystem="2"
|
||||
OptimizeReferences="2"
|
||||
@ -179,6 +183,76 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release_LIB|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="2"
|
||||
WholeProgramOptimization="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="false"
|
||||
AdditionalIncludeDirectories="d:\opt\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"""
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="false"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="0"
|
||||
CompileAs="2"
|
||||
DisableSpecificWarnings="4018;4244;4305"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="$(OutDir)\libzintMD.lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
@ -235,6 +309,14 @@
|
||||
<File
|
||||
RelativePath="..\backend\dllversion.c"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release_LIB|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\dm200.c"
|
||||
@ -244,6 +326,10 @@
|
||||
RelativePath="..\backend\dmatrix.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\gridmtx.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\gs1.c"
|
||||
>
|
||||
@ -268,10 +354,6 @@
|
||||
RelativePath="..\backend\medical.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\micqr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\pdf417.c"
|
||||
>
|
||||
@ -280,6 +362,10 @@
|
||||
RelativePath="..\backend\plessey.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\png.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\postal.c"
|
||||
>
|
||||
@ -350,6 +436,14 @@
|
||||
RelativePath="..\backend\font.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\gb2312.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\gridmtx.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\gs1.h"
|
||||
>
|
||||
@ -367,17 +461,25 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\micqr.h"
|
||||
RelativePath="..\backend\ms_stdint.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\pdf417.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\qr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\reedsol.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\resource.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\backend\rss.h"
|
||||
>
|
||||
@ -397,8 +499,16 @@
|
||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\backend\zint.rc"
|
||||
RelativePath="..\backend\libzint.rc"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Release_LIB|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
|
||||
@ -1,26 +1,32 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual Studio 2008
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zint", "zint.vcproj", "{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{63287BBA-3B4C-44A8-B538-B2E8530B2BE6} = {63287BBA-3B4C-44A8-B538-B2E8530B2BE6}
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B} = {5C08DC40-8F7D-475E-AA3C-814DED735A4B}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzint", "libzint.vcproj", "{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzint", "libzint.vcproj", "{5C08DC40-8F7D-475E-AA3C-814DED735A4B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release_LIB|Win32 = Release_LIB|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release_LIB|Win32.Build.0 = Release_LIB|Win32
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{3169C7FA-E52C-4BFC-B7BB-E55EBA133770}.Release|Win32.Build.0 = Release|Win32
|
||||
{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{63287BBA-3B4C-44A8-B538-B2E8530B2BE6}.Release|Win32.Build.0 = Release|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.ActiveCfg = Release_LIB|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release_LIB|Win32.Build.0 = Release_LIB|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{5C08DC40-8F7D-475E-AA3C-814DED735A4B}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\backend"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.1.3\"";ZINT_DLL"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"";ZINT_DLL"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="0"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -114,12 +114,13 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
AdditionalIncludeDirectories="..\backend"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.1.3\"";ZINT_DLL"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"";ZINT_DLL"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="false"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="0"
|
||||
@ -135,6 +136,80 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalLibraryDirectories="d:\opt\lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release_LIB|Win32"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
CharacterSet="2"
|
||||
WholeProgramOptimization="0"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
AdditionalIncludeDirectories="..\backend"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.3.0\"""
|
||||
StringPooling="true"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="false"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
DebugInformationFormat="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libpngMD.lib zlibMD.lib"
|
||||
AdditionalLibraryDirectories="d:\opt\lib"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
@ -189,6 +264,10 @@
|
||||
RelativePath=".\frontend\getopt.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\frontend\resource.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user