sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build file changes for android.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+78 -46
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
LIB_DIRS = $${PREFIX}/lib \ !android{
$${PREFIX}/lib64 LIB_DIRS = $${PREFIX}/lib \
$${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,13 +434,15 @@ unix:!mac {
message("Found $$lib") message("Found $$lib")
BOOST_REGEX = -l$$lib BOOST_REGEX = -l$$lib
} }
for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) { !android{
message("Found $$lib") for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.so*) {
BOOST_RANDOM = -l$$lib message("Found $$lib")
} BOOST_RANDOM = -l$$lib
for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.a) { }
message("Found $$lib") for(lib, BOOST_RANDOM):exists($${dir}/lib$${lib}.a) {
BOOST_RANDOM = -l$$lib message("Found $$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")
@@ -446,44 +453,60 @@ unix:!mac {
BOOST_SYS = -l$$lib BOOST_SYS = -l$$lib
} }
} }
BOOST_LIBS = $$BOOST_THREAD \ !android{
$$BOOST_FS \ BOOST_LIBS = $$BOOST_THREAD \
$$BOOST_IOSTREAMS \ $$BOOST_FS \
$$BOOST_REGEX \ $$BOOST_IOSTREAMS \
$$BOOST_RANDOM \ $$BOOST_REGEX \
$$BOOST_SYS $$BOOST_RANDOM \
!count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}") $$BOOST_SYS
if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!") !count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}")
UNAME = $$system(uname -s) if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!")
BSD = $$find(UNAME, "BSD") UNAME = $$system(uname -s)
kFreeBSD = $$find(UNAME, "kFreeBSD") BSD = $$find(UNAME, "BSD")
LIBS += -lsqlite3 \ kFreeBSD = $$find(UNAME, "kFreeBSD")
-ltinyxml LIBS += -lsqlite3 \
LIBS += $$BOOST_LIBS -ltinyxml
LIBS += -lSDL \ LIBS += $$BOOST_LIBS
-lSDL_mixer \ LIBS += -lSDL \
-lgsasl -lSDL_mixer \
!isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto -lgsasl
else:LIBS += -lgcrypt !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto
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
# #### My release static libs !android{
# LIBS += -lgcrypt_static -lgpg-error_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl # #### My release static libs
# ### INSTALL #### # LIBS += -lgcrypt_static -lgpg-error_static -lgnutls_static -lSDL_mixer_static -lSDL -lmikmod -lcurl
binary.path += $${PREFIX}/bin/ # ### INSTALL ####
binary.files += pokerth binary.path += $${PREFIX}/bin/
data.path += $${PREFIX}/share/pokerth/data/ binary.files += pokerth
data.files += data/* data.path += $${PREFIX}/share/pokerth/data/
pixmap.path += $${PREFIX}/share/pixmaps/ data.files += data/*
pixmap.files += pokerth.png pixmap.path += $${PREFIX}/share/pixmaps/
desktop.path += $${PREFIX}/share/applications/ pixmap.files += pokerth.png
desktop.files += pokerth.desktop desktop.path += $${PREFIX}/share/applications/
INSTALLS += binary \ desktop.files += pokerth.desktop
data \ INSTALLS += binary \
pixmap \ data \
desktop pixmap \
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
}
pokerth_lib.pro
+11 -11
View File
@@ -242,14 +242,14 @@ mac{
INCLUDEPATH += /opt/local/include INCLUDEPATH += /opt/local/include
} }
android{ android{
# Use old boost::filesystem, because the new version requires std::wstring. # Use old boost::filesystem, because the new version requires std::wstring.
DEFINES += BOOST_FILESYSTEM_VERSION=2 DEFINES += BOOST_FILESYSTEM_VERSION=2
# If /usr/include is included, this will mess with the android sdk. # If /usr/include is included, this will mess with the android sdk.
INCLUDEPATH -= /usr/include INCLUDEPATH -= /usr/include
# Include directory containing android builds of used libs. # Include directory containing android builds of used libs.
INCLUDEPATH += ../cmoss/bin/droid/include INCLUDEPATH += ../cmoss/bin/droid/include
# sqlite3 is included directly. # sqlite3 is included directly.
INCLUDEPATH += src/third_party/sqlite3 INCLUDEPATH += src/third_party/sqlite3
SOURCES += src/third_party/sqlite3/sqlite3.c SOURCES += src/third_party/sqlite3/sqlite3.c
} }