Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-24 20:36:03 +00:00
Code Issues Projects Releases Wiki Activity

version strings updated to 2.4.2

Browse Source
This commit is contained in:
tgotic
2011-05-04 21:50:02 +02:00
parent 891570299c
commit 6a69a212a0
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/Makefile.mingw
View File

@@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # make clean cleans up a previous compilation and any object or editor files
# #
ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\" ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
CC:= gcc -m32 CC:= gcc -m32
@@ -15,7 +15,7 @@ AR:= ar rc
RANLIB:= ranlib RANLIB:= ranlib
INCLUDE:= -I/mingw/include INCLUDE:= -I/mingw/include
CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall
LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=40 LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42
RC:= windres RC:= windres
RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES

8
backend/dllversion.c
View File

@@ -1,5 +1,5 @@
/* Sed: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/versions.asp */ /* Sed: http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/versions.asp */
#if defined (WIN32) && (defined(_USRDLL) || defined(DLL_EXPORT) || defined(PIC)) #if defined (_WIN32) && (defined(_USRDLL) || defined(DLL_EXPORT) || defined(PIC))
#include <windows.h> #include <windows.h>
#include <shlwapi.h> #include <shlwapi.h>
@@ -21,11 +21,11 @@ HRESULT DllGetVersion (DLLVERSIONINFO2* pdvi)
pdvi->info1.dwMajorVersion = 2; pdvi->info1.dwMajorVersion = 2;
pdvi->info1.dwMinorVersion = 4; pdvi->info1.dwMinorVersion = 4;
pdvi->info1.dwBuildNumber = 1; pdvi->info1.dwBuildNumber = 2;
pdvi->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; pdvi->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS;
if (sizeof(DLLVERSIONINFO2) == pdvi->info1.cbSize) if (sizeof(DLLVERSIONINFO2) == pdvi->info1.cbSize)
pdvi->ullVersion = MAKEDLLVERULL(2, 4, 1, 0); pdvi->ullVersion = MAKEDLLVERULL(2, 4, 2, 0);
return S_OK; return S_OK;
} }
#endif /* WIN32 */ #endif /* _WIN32 */

4
backend_qt4/backend_vcx.pro
View File

@@ -1,10 +1,10 @@
win32 { win32 {
TEMPLATE = vclib TEMPLATE = vclib
CONFIG += staticlib debug-and-release CONFIG += staticlib release
} }
TARGET = QtZint2 TARGET = QtZint2
VERSION = 2.4.1 VERSION = 2.4.2
QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305

7
frontend/Makefile.mingw
View File

@@ -6,10 +6,11 @@
# make clean cleans up a previous compilation and any object or editor files # make clean cleans up a previous compilation and any object or editor files
# #
ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\" ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
CC := gcc -m32 CC := gcc -m32
CFLAGS := -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend CFLAGS := -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend
LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42
prefix := /mingw prefix := /mingw
bindir := $(prefix)/bin bindir := $(prefix)/bin
DESTDIR := DESTDIR :=
@@ -27,10 +28,10 @@ all: zint zint_static
windres -v -F pe-i386 --define GCC_WINDRES -O coff --input-format=rc -i $< -o $@ windres -v -F pe-i386 --define GCC_WINDRES -O coff --input-format=rc -i $< -o $@
zint: main.c zint.res zint: main.c zint.res
$(CC) $(CFLAGS) -DZINT_DLL $(DEFINES_DLL) $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint.dll $(LIBS) $(CC) $(CFLAGS) -DZINT_DLL $(DEFINES_DLL) $(ZINT_VERSION) $(LDFLAGS) $? zint.res -o $@ -L../backend -lzint.dll $(LIBS)
zint_static: main.c zint.res zint_static: main.c zint.res
$(CC) -static $(CFLAGS) $(ZINT_VERSION) $? zint.res -o $@ -L../backend -lzint $(LIBS) $(CC) -static $(CFLAGS) $(ZINT_VERSION) $(LDFLAGS) $? zint.res -o $@ -L../backend -lzint $(LIBS)
.PHONY: install uninstall clean dist .PHONY: install uninstall clean dist