commit f769c4e1f835011e9375dca3725215aca840ef95
author Tom Finegan <tomfinegan@google.com> Wed Feb 15 14:37:29 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Thu Feb 16 17:39:31 2017 +0000
tree a5fb3c913e3b4add761acbc40781025a4fa03904
parent c4e9e473c6196edcb1b6173de0d8f5af68a016ae

Make 32 bit builds via cmake possible on macos.

Working with ninja, make, and xcode generators using the
following args at cmake generation time:
-DAOM_TARGET_CPU=x86 -DCMAKE_OSX_ARCHITECTURES=i386 -DCONFIG_PIC=1

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: I830db21f7458417cb8048818e5681a78698a6068

build/cmake/aom_configure.cmake

diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index fbadc10..463f73a 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -30,18 +30,19 @@
               "      CMAKE_GENERATOR=${CMAKE_GENERATOR}\n")
     endif ()
   endif ()
-  set(AOM_TARGET_SYSTEM ${CMAKE_SYSTEM_NAME})
-  if (NOT EXISTS "${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake")
-    message("No RTCD template for ${AOM_TARGET_CPU}, using generic.")
+endif ()
+
+set(AOM_TARGET_SYSTEM ${CMAKE_SYSTEM_NAME})
+if (NOT EXISTS "${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake")
+  message("No RTCD template for ${AOM_TARGET_CPU}, using generic.")
+  set(AOM_TARGET_CPU "generic")
+endif ()
+if ("${AOM_TARGET_CPU}" STREQUAL "x86" OR "${AOM_TARGET_CPU}" STREQUAL "x86_64")
+  find_program(YASM_EXECUTABLE yasm $ENV{YASM_PATH})
+  if (NOT YASM_EXECUTABLE)
+    message(WARNING "Unable to find yasm, using generic as target CPU.")
     set(AOM_TARGET_CPU "generic")
   endif ()
-  if (NOT AOM_TARGET_CPU STREQUAL "generic")
-    find_program(YASM_EXECUTABLE yasm $ENV{YASM_PATH})
-    if (NOT YASM_EXECUTABLE)
-      message(WARNING "Unable to find yasm, using generic as target CPU.")
-      set(AOM_TARGET_CPU "generic")
-    endif ()
-  endif ()
 endif ()
 
 include("${AOM_ROOT}/build/cmake/targets/${AOM_TARGET_CPU}.cmake")

build/cmake/aom_optimization.cmake

diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
index 76e7c42..dc304b3 100644
--- a/build/cmake/aom_optimization.cmake
+++ b/build/cmake/aom_optimization.cmake
@@ -79,7 +79,9 @@
       message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")
     endif ()
   elseif ("${AOM_TARGET_CPU}" STREQUAL "x86")
-    if ("${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
+    if ("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
+      set(objformat "macho32")
+    elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
       set(objformat "win32")
     else ()
       message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")