Build file changes for android.

This commit is contained in:
lotodore
2012-04-22 10:18:27 +00:00
parent 9a451cfb8c
commit 807c8bb454
2 changed files with 89 additions and 57 deletions
+35 -3
View File
@@ -378,8 +378,13 @@ unix:!mac {
# QMAKE_LFLAGS += -Wl,--gc-sections # QMAKE_LFLAGS += -Wl,--gc-sections
LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
!android{
LIB_DIRS = $${PREFIX}/lib \ LIB_DIRS = $${PREFIX}/lib \
$${PREFIX}/lib64 $${PREFIX}/lib64
}
android{
LIB_DIRS = ../cmoss/bin/droid/lib/armv5
}
BOOST_FS = boost_filesystem \ BOOST_FS = boost_filesystem \
boost_filesystem-mt boost_filesystem-mt
BOOST_THREAD = boost_thread \ BOOST_THREAD = boost_thread \
@@ -429,6 +434,7 @@ unix:!mac {
message("Found $$lib") message("Found $$lib")
BOOST_REGEX = -l$$lib BOOST_REGEX = -l$$lib
} }
!android{
for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) { for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib") message("Found $$lib")
BOOST_RANDOM = -l$$lib BOOST_RANDOM = -l$$lib
@@ -437,6 +443,7 @@ unix:!mac {
message("Found $$lib") message("Found $$lib")
BOOST_RANDOM = -l$$lib BOOST_RANDOM = -l$$lib
} }
}
for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) { for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
message("Found $$lib") message("Found $$lib")
BOOST_SYS = -l$$lib BOOST_SYS = -l$$lib
@@ -446,6 +453,7 @@ unix:!mac {
BOOST_SYS = -l$$lib BOOST_SYS = -l$$lib
} }
} }
!android{
BOOST_LIBS = $$BOOST_THREAD \ BOOST_LIBS = $$BOOST_THREAD \
$$BOOST_FS \ $$BOOST_FS \
$$BOOST_IOSTREAMS \ $$BOOST_IOSTREAMS \
@@ -465,10 +473,24 @@ unix:!mac {
-lgsasl -lgsasl
!isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto
else:LIBS += -lgcrypt else:LIBS += -lgcrypt
}
android{
BOOST_LIBS = $$BOOST_THREAD \
$$BOOST_FS \
$$BOOST_IOSTREAMS \
$$BOOST_REGEX \
$$BOOST_SYS
!count(BOOST_LIBS, 5):error("Unable to find boost libraries in ../cmoss/bin/droid/lib/armv5")
LIBS += -ltinyxml
LIBS += $$BOOST_LIBS
LIBS += -lgsasl
LIBS += -lssl -lcrypto -lgcrypt -lgpg-error
}
TARGETDEPS += ./lib/libpokerth_lib.a \ TARGETDEPS += ./lib/libpokerth_lib.a \
./lib/libpokerth_db.a \ ./lib/libpokerth_db.a \
./lib/libpokerth_protocol.a ./lib/libpokerth_protocol.a
!android{
# #### My release static libs # #### My release static libs
# LIBS += -lgcrypt_static -lgpg-error_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl # LIBS += -lgcrypt_static -lgpg-error_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl
# ### INSTALL #### # ### INSTALL ####
@@ -484,6 +506,7 @@ unix:!mac {
data \ data \
pixmap \ pixmap \
desktop desktop
}
} }
mac { mac {
# make it x86_64 only # make it x86_64 only
@@ -572,6 +595,15 @@ gui_800x480 {
src/gui/qt/gui_800x480/tabs_800x480.ui src/gui/qt/gui_800x480/tabs_800x480.ui
} }
android{
# Use old boost::filesystem, because the new version requires std::wstring.
DEFINES += BOOST_FILESYSTEM_VERSION=2
# If /usr/include is included, this will mess with the android sdk.
INCLUDEPATH -= /usr/include
LIBPATH -= /usr/lib
# Include directory containing android builds of used libs.
INCLUDEPATH += ../cmoss/bin/droid/include
LIBPATH += ../cmoss/bin/droid/lib/armv5
# sqlite3 is included directly.
INCLUDEPATH += src/third_party/sqlite3
}