Merge 3party and 3party_sloynik. Remove sloynik_common.pri.

2011-03-06 12:08:58 +01:00 · 2011-03-06 12:08:58 +01:00 · 2cbf9325c4
commit 2cbf9325c4
parent 5d9239a1ed
159 changed files with 36 additions and 12495 deletions
--- a/3party/3party.pro
+++ b/3party/3party.pro
@ -2,7 +2,7 @@

 TEMPLATE = subdirs

-SUBDIRS = expat freetype fribidi
+SUBDIRS = expat freetype fribidi zlib bzip2 jansson protobuf

 !iphonesimulator-g++42 {
  !iphonedevice-g++42 {
--- a/3party_sloynik/bzip2/CHANGES
+++ b/3party_sloynik/bzip2/CHANGES
--- a/3party_sloynik/bzip2/LICENSE
+++ b/3party_sloynik/bzip2/LICENSE
--- a/3party_sloynik/bzip2/Makefile-libbz2_so
+++ b/3party_sloynik/bzip2/Makefile-libbz2_so
--- a/3party_sloynik/bzip2/README
+++ b/3party_sloynik/bzip2/README
--- a/3party_sloynik/bzip2/README.COMPILATION.PROBLEMS
+++ b/3party_sloynik/bzip2/README.COMPILATION.PROBLEMS
--- a/3party_sloynik/bzip2/README.XML.STUFF
+++ b/3party_sloynik/bzip2/README.XML.STUFF
--- a/3party_sloynik/bzip2/blocksort.c
+++ b/3party_sloynik/bzip2/blocksort.c
--- a/3party_sloynik/bzip2/blocksort.o
+++ b/3party_sloynik/bzip2/blocksort.o
--- a/3party_sloynik/bzip2/bz-common.xsl
+++ b/3party_sloynik/bzip2/bz-common.xsl
--- a/3party_sloynik/bzip2/bz-fo.xsl
+++ b/3party_sloynik/bzip2/bz-fo.xsl
--- a/3party_sloynik/bzip2/bz-html.xsl
+++ b/3party_sloynik/bzip2/bz-html.xsl
--- a/3party_sloynik/bzip2/bzdiff
+++ b/3party_sloynik/bzip2/bzdiff
--- a/3party_sloynik/bzip2/bzdiff.1
+++ b/3party_sloynik/bzip2/bzdiff.1
--- a/3party_sloynik/bzip2/bzgrep
+++ b/3party_sloynik/bzip2/bzgrep
--- a/3party_sloynik/bzip2/bzgrep.1
+++ b/3party_sloynik/bzip2/bzgrep.1
--- a/3party_sloynik/bzip2/bzip.css
+++ b/3party_sloynik/bzip2/bzip.css
--- a/3party_sloynik/bzip2/bzip2.1
+++ b/3party_sloynik/bzip2/bzip2.1
--- a/3party_sloynik/bzip2/bzip2.1.preformatted
+++ b/3party_sloynik/bzip2/bzip2.1.preformatted
--- a/3party_sloynik/bzip2/bzip2.c
+++ b/3party_sloynik/bzip2/bzip2.c
--- a/3party_sloynik/bzip2/bzip2.pro
+++ b/3party_sloynik/bzip2/bzip2.pro
@ -1,6 +1,6 @@
 TARGET = bzip2
-SLOYNIK_DIR = ../..
-include($$SLOYNIK_DIR/sloynik_common.pri)
+ROOT_DIR = ../..
+include($$ROOT_DIR/common.pri)

 TEMPLATE = lib
 CONFIG += staticlib
--- a/3party_sloynik/bzip2/bzip2.txt
+++ b/3party_sloynik/bzip2/bzip2.txt
--- a/3party_sloynik/bzip2/bzip2recover.c
+++ b/3party_sloynik/bzip2/bzip2recover.c
--- a/3party_sloynik/bzip2/bzlib.c
+++ b/3party_sloynik/bzip2/bzlib.c
--- a/3party_sloynik/bzip2/bzlib.h
+++ b/3party_sloynik/bzip2/bzlib.h
--- a/3party_sloynik/bzip2/bzlib.o
+++ b/3party_sloynik/bzip2/bzlib.o
--- a/3party_sloynik/bzip2/bzlib_private.h
+++ b/3party_sloynik/bzip2/bzlib_private.h
--- a/3party_sloynik/bzip2/bzmore
+++ b/3party_sloynik/bzip2/bzmore
--- a/3party_sloynik/bzip2/bzmore.1
+++ b/3party_sloynik/bzip2/bzmore.1
--- a/3party_sloynik/bzip2/compress.c
+++ b/3party_sloynik/bzip2/compress.c
--- a/3party_sloynik/bzip2/compress.o
+++ b/3party_sloynik/bzip2/compress.o
--- a/3party_sloynik/bzip2/crctable.c
+++ b/3party_sloynik/bzip2/crctable.c
--- a/3party_sloynik/bzip2/crctable.o
+++ b/3party_sloynik/bzip2/crctable.o
--- a/3party_sloynik/bzip2/decompress.c
+++ b/3party_sloynik/bzip2/decompress.c
--- a/3party_sloynik/bzip2/decompress.o
+++ b/3party_sloynik/bzip2/decompress.o
--- a/3party_sloynik/bzip2/dlltest.c
+++ b/3party_sloynik/bzip2/dlltest.c
--- a/3party_sloynik/bzip2/dlltest.dsp
+++ b/3party_sloynik/bzip2/dlltest.dsp
--- a/3party_sloynik/bzip2/entities.xml
+++ b/3party_sloynik/bzip2/entities.xml
--- a/3party_sloynik/bzip2/format.pl
+++ b/3party_sloynik/bzip2/format.pl
--- a/3party_sloynik/bzip2/huffman.c
+++ b/3party_sloynik/bzip2/huffman.c
--- a/3party_sloynik/bzip2/huffman.o
+++ b/3party_sloynik/bzip2/huffman.o
--- a/3party_sloynik/bzip2/impure.c
+++ b/3party_sloynik/bzip2/impure.c
--- a/3party_sloynik/bzip2/libbz2.def
+++ b/3party_sloynik/bzip2/libbz2.def
--- a/3party_sloynik/bzip2/libbz2.dsp
+++ b/3party_sloynik/bzip2/libbz2.dsp
--- a/3party_sloynik/bzip2/makefile.msc
+++ b/3party_sloynik/bzip2/makefile.msc
--- a/3party_sloynik/bzip2/manual.html
+++ b/3party_sloynik/bzip2/manual.html
--- a/3party_sloynik/bzip2/manual.pdf
+++ b/3party_sloynik/bzip2/manual.pdf
--- a/3party_sloynik/bzip2/manual.ps
+++ b/3party_sloynik/bzip2/manual.ps
--- a/3party_sloynik/bzip2/manual.xml
+++ b/3party_sloynik/bzip2/manual.xml
--- a/3party_sloynik/bzip2/mk251.c
+++ b/3party_sloynik/bzip2/mk251.c
--- a/3party_sloynik/bzip2/randtable.c
+++ b/3party_sloynik/bzip2/randtable.c
--- a/3party_sloynik/bzip2/randtable.o
+++ b/3party_sloynik/bzip2/randtable.o
--- a/3party_sloynik/bzip2/sample1.bz2
+++ b/3party_sloynik/bzip2/sample1.bz2
--- a/3party_sloynik/bzip2/sample1.ref
+++ b/3party_sloynik/bzip2/sample1.ref
--- a/3party_sloynik/bzip2/sample2.bz2
+++ b/3party_sloynik/bzip2/sample2.bz2
--- a/3party_sloynik/bzip2/sample2.ref
+++ b/3party_sloynik/bzip2/sample2.ref
--- a/3party_sloynik/bzip2/sample3.bz2
+++ b/3party_sloynik/bzip2/sample3.bz2
--- a/3party_sloynik/bzip2/sample3.ref
+++ b/3party_sloynik/bzip2/sample3.ref
--- a/3party_sloynik/bzip2/spewG.c
+++ b/3party_sloynik/bzip2/spewG.c
--- a/3party_sloynik/bzip2/unzcrash.c
+++ b/3party_sloynik/bzip2/unzcrash.c
--- a/3party_sloynik/bzip2/words0
+++ b/3party_sloynik/bzip2/words0
--- a/3party_sloynik/bzip2/words1
+++ b/3party_sloynik/bzip2/words1
--- a/3party_sloynik/bzip2/words2
+++ b/3party_sloynik/bzip2/words2
--- a/3party_sloynik/bzip2/words3
+++ b/3party_sloynik/bzip2/words3
--- a/3party_sloynik/bzip2/xmlproc.sh
+++ b/3party_sloynik/bzip2/xmlproc.sh
--- a/3party_sloynik/jansson/CHANGES
+++ b/3party_sloynik/jansson/CHANGES
--- a/3party_sloynik/jansson/LICENSE
+++ b/3party_sloynik/jansson/LICENSE
--- a/3party_sloynik/jansson/README.rst
+++ b/3party_sloynik/jansson/README.rst
--- a/3party_sloynik/jansson/jansson.pro
+++ b/3party_sloynik/jansson/jansson.pro
@ -1,6 +1,6 @@
 TARGET = jansson
-SLOYNIK_DIR = ../..
-include($$SLOYNIK_DIR/sloynik_common.pri)
+ROOT_DIR = ../..
+include($$ROOT_DIR/common.pri)

 TEMPLATE = lib
 CONFIG += staticlib
--- a/3party_sloynik/jansson/myjansson.hpp
+++ b/3party_sloynik/jansson/myjansson.hpp
--- a/3party_sloynik/jansson/src/config.h
+++ b/3party_sloynik/jansson/src/config.h
--- a/3party_sloynik/jansson/src/dump.c
+++ b/3party_sloynik/jansson/src/dump.c
--- a/3party_sloynik/jansson/src/hashtable.c
+++ b/3party_sloynik/jansson/src/hashtable.c
--- a/3party_sloynik/jansson/src/hashtable.h
+++ b/3party_sloynik/jansson/src/hashtable.h
--- a/3party_sloynik/jansson/src/jansson.h
+++ b/3party_sloynik/jansson/src/jansson.h
--- a/3party_sloynik/jansson/src/jansson_private.h
+++ b/3party_sloynik/jansson/src/jansson_private.h
--- a/3party_sloynik/jansson/src/load.c
+++ b/3party_sloynik/jansson/src/load.c
--- a/3party_sloynik/jansson/src/strbuffer.c
+++ b/3party_sloynik/jansson/src/strbuffer.c
--- a/3party_sloynik/jansson/src/strbuffer.h
+++ b/3party_sloynik/jansson/src/strbuffer.h
--- a/3party_sloynik/jansson/src/utf.c
+++ b/3party_sloynik/jansson/src/utf.c
--- a/3party_sloynik/jansson/src/utf.h
+++ b/3party_sloynik/jansson/src/utf.h
--- a/3party_sloynik/jansson/src/util.h
+++ b/3party_sloynik/jansson/src/util.h
--- a/3party_sloynik/jansson/src/value.c
+++ b/3party_sloynik/jansson/src/value.c
--- a/3party_sloynik/zlib/adler32.c
+++ b/3party_sloynik/zlib/adler32.c
--- a/3party_sloynik/zlib/compress.c
+++ b/3party_sloynik/zlib/compress.c
--- a/3party_sloynik/zlib/crc32.c
+++ b/3party_sloynik/zlib/crc32.c
--- a/3party_sloynik/zlib/crc32.h
+++ b/3party_sloynik/zlib/crc32.h
--- a/3party_sloynik/zlib/deflate.c
+++ b/3party_sloynik/zlib/deflate.c
--- a/3party_sloynik/zlib/deflate.h
+++ b/3party_sloynik/zlib/deflate.h
--- a/3party_sloynik/zlib/example.c
+++ b/3party_sloynik/zlib/example.c
--- a/3party_sloynik/zlib/gzclose.c
+++ b/3party_sloynik/zlib/gzclose.c
--- a/3party_sloynik/zlib/gzguts.h
+++ b/3party_sloynik/zlib/gzguts.h
--- a/3party_sloynik/zlib/gzlib.c
+++ b/3party_sloynik/zlib/gzlib.c
--- a/3party_sloynik/zlib/gzread.c
+++ b/3party_sloynik/zlib/gzread.c
--- a/3party_sloynik/zlib/gzwrite.c
+++ b/3party_sloynik/zlib/gzwrite.c
--- a/3party_sloynik/zlib/infback.c
+++ b/3party_sloynik/zlib/infback.c
--- a/3party_sloynik/zlib/inffast.c
+++ b/3party_sloynik/zlib/inffast.c
--- a/3party_sloynik/zlib/inffast.h
+++ b/3party_sloynik/zlib/inffast.h
--- a/3party_sloynik/zlib/inffixed.h
+++ b/3party_sloynik/zlib/inffixed.h
--- a/3party_sloynik/zlib/inflate.c
+++ b/3party_sloynik/zlib/inflate.c
--- a/Show more
+++ b/Show more