Skip to content
GitLab
Commit 98b87399 authored by Tom Finegan's avatar Tom Finegan
Browse files

Support make builds using gcc via CMake in MSYS on Windows. 

BUG=aomedia:76

Change-Id: I3dac547d09615c0f48fbfab687a4a2bf7d4bf3b4
parent 9884be0b
Show whitespace changes
Inline Side-by-side
build/cmake/aom_optimization.cmake
View file @ 98b87399
......@@ -75,7 +75,8 @@ function (get_asm_obj_format out_format)
set(objformat "macho64")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
set(objformat "elf64")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR
"${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
set(objformat "win64")
else ()
message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")
......@@ -85,7 +86,8 @@ function (get_asm_obj_format out_format)
set(objformat "macho32")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
set(objformat "elf32")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
elseif ("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR
"${AOM_TARGET_SYSTEM}" STREQUAL "Windows")
set(objformat "win32")
else ()
message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment