Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
option java_package = "de.pokerth.protocol";
|
option java_package = "de.pokerth.protocol";
|
||||||
option java_outer_classname = "ProtoBuf";
|
option java_outer_classname = "ProtoBuf";
|
||||||
|
option optimize_for = LITE_RUNTIME;
|
||||||
|
|
||||||
// Enumerations used by several messages.
|
// Enumerations used by several messages.
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -508,7 +508,7 @@ unix:!mac {
|
|||||||
LIBS += -ltinyxml
|
LIBS += -ltinyxml
|
||||||
LIBS += $$BOOST_LIBS
|
LIBS += $$BOOST_LIBS
|
||||||
LIBS += -lgsasl -lidn
|
LIBS += -lgsasl -lidn
|
||||||
LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf
|
LIBS += -lssl -lcrypto -lgcrypt -lgpg-error -lprotobuf-lite
|
||||||
}
|
}
|
||||||
TARGETDEPS += ./lib/libpokerth_lib.a \
|
TARGETDEPS += ./lib/libpokerth_lib.a \
|
||||||
./lib/libpokerth_db.a \
|
./lib/libpokerth_db.a \
|
||||||
|
|||||||
+751
-9019
File diff suppressed because it is too large
Load Diff
+249
-1997
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user