Pileus Git - ~andy/sunrise/blob - games-strategy/0ad/files/11339_alpha9-test.patch

   1 upstream patch: http://trac.wildfiregames.com/changeset/11661
   2
   3 Build test executable with same linker settings as game executable,
   4 to fix --without-fam
   5
   6 --- build/premake/premake4.lua
   7 +++ build/premake/premake4.lua
   8 @@ -1167,13 +1167,20 @@
   9
  10                 project_add_manifest()
  11
  12 -       elseif os.is("linux") or os.is ("bsd") then
  13 -
  14 -               links {
  15 -                       "fam",
  16 -                       -- Utilities
  17 -                       "rt",
  18 -               }
  19 +       elseif os.is("linux") or os.is("bsd") then
  20 +
  21 +               if not _OPTIONS["without-fam"] then
  22 +                       links { "fam" }
  23 +               end
  24 +
  25 +               if not _OPTIONS["android"] then
  26 +                       links { "rt" }
  27 +               end
  28 +
  29 +               if _OPTIONS["android"] then
  30 +                       -- NDK's STANDALONE-TOOLCHAIN.html says this is required
  31 +                       linkoptions { "-Wl,--fix-cortex-a8" }
  32 +               end
  33
  34                 if os.is("linux") then
  35                         links {
  36 @@ -1189,7 +1196,9 @@
  37
  38                 -- Threading support
  39                 buildoptions { "-pthread" }
  40 -               linkoptions { "-pthread" }
  41 +               if not _OPTIONS["android"] then
  42 +                       linkoptions { "-pthread" }
  43 +               end
  44
  45                 -- For debug_resolve_symbol
  46                 configuration "Debug"