Merge remote-tracking branch 'origin/master'

2012-11-10 02:02:52 +01:00
parent e8498d1338 9ee5ed4dd9
commit ec75024e29
4 changed files with 1002 additions and 11017 deletions
@@ -18,6 +18,7 @@

 option java_package = "de.pokerth.protocol";
 option java_outer_classname = "ProtoBuf";
+option optimize_for = LITE_RUNTIME;

 // Enumerations used by several messages.

@@ -508,7 +508,7 @@ unix:!mac {
 		LIBS += -ltinyxml
 		LIBS += $$BOOST_LIBS
 		LIBS += -lgsasl -lidn
-                LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf
+                LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite
 	}
 	TARGETDEPS += ./lib/libpokerth_lib.a \
 		./lib/libpokerth_db.a \