From b3fe74bb7067581371f487b12112b62ef8e66b9e Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 3 Jun 2010 15:33:07 -0700 Subject: Add libprotobuf-cpp-2.3.0-lite Added android/config.h which will be used to configure android builds of libraries. Currently I've undef HAVE_HASH_MAP and HAVE_HASH_SET as the versions in stlport generated compile errors. Updated .gitignore to be more selective on what it ignores so android/config.h wouldn't be ignored. Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d --- .gitignore | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d1a56d5..f6d12c5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,16 +6,18 @@ *~ *.lo *.la -Makefile -config.h -src/Makefile -/stamp.h1 .deps -config.log -config.status +/stamp-h1 +/Makefile +/src/Makefile +/config.log +/config.status +/config.h gtest/Makefile gtest/build-aux/config.h gtest/build-aux/stamp-h1 +gtest/config.log +gtest/config.status gtest/libtool gtest/scripts/gtest-config gtest/lib @@ -24,7 +26,6 @@ protobuf.pc protobuf-lite.pc libtool autom4te.cache/ -/stamp-h1 core src/google/protobuf/unittest*pb* src/google/protobuf/compiler/cpp/cpp*pb* @@ -41,4 +42,5 @@ src/testzip.jar src/testzip.list src/testzip.proto src/testzip.zip +vsprojects/config.h java/target/ -- cgit v1.1