mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://zint.git.sourceforge.net/gitroot/zint/zint

Browse Source 
Conflicts:
	backend/CMakeLists.txt
	backend/Makefile
	backend/Makefile.mingw
	backend/library.c
	backend/zint.h
This commit is contained in:
Sam Lown
2010-06-11 20:10:55 +02:00
parent 847cd70e32 511fadef30
commit 68de839804
6 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/CMakeLists.txt
View File

@ -4,7 +4,11 @@ project(zint)
find_package(PNG)
<<<<<<< HEAD
set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c)
=======
set(zint_COMMON_SRCS common.c library.c ps.c large.c reedsol.c gs1.c svg.c png.c)
>>>>>>> 511fadef30c0f8634c6a7126edae0554914bcb92
set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c)
set(zint_POSTAL_SRCS postal.c auspost.c imail.c)
set(zint_TWODIM_SRCS code16k.c dmatrix.c dm200.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c)