Merge pull request #12 from schnitzeltony/master

freeeciv fixes for current oe-core / meta qt5

recipes-games/freeciv/freeciv.inc

@@ -26,7 +26,9 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "\
 --enable-shared --without-ggz-dir --enable-client=${FREECIV_GUI} \
 --disable-mapimg \
-SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config \
+--disable-sdltest \
+--disable-sdl2test \
+SDL_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl' \
 "
 
 acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"

recipes-games/freeciv/freeciv_2.5.1.bb

@@ -7,6 +7,7 @@ DEPENDS += "gtk+3 qtbase"
 EXTRA_OECONF += "\
 --with-qt5-includes=${STAGING_INCDIR}/qt5 \
 --with-qt5-libs=${STAGING_LIBDIR}/qt5 \
+MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \
 "
 
 SRC_URI[md5sum] = "b94bf68ce5f3611c71fac9753598b046"