use the correct extension for x86

This commit is contained in:
Kalamatee 2016-08-10 01:46:43 +01:00 committed by Daniel Gibson
parent 2fb870b13f
commit b86dac5719

View file

@ -780,6 +780,11 @@ include_directories(${CMAKE_SOURCE_DIR})
add_library(idlib STATIC ${src_idlib}) add_library(idlib STATIC ${src_idlib})
if (AROS) if (AROS)
add_library(dll STATIC ${src_arosdll}) add_library(dll STATIC ${src_arosdll})
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "i386")
set(AROS_ARCH "x86")
else()
set(AROS_ARCH ${CMAKE_SYSTEM_PROCESSOR})
endif()
else() else()
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MINGW) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)
set_target_properties(idlib PROPERTIES COMPILE_FLAGS "-fPIC") set_target_properties(idlib PROPERTIES COMPILE_FLAGS "-fPIC")
@ -853,7 +858,7 @@ endif()
if(BASE) if(BASE)
if (AROS) if (AROS)
add_executable(base sys/aros/dll/dllglue.c ${src_game}) add_executable(base sys/aros/dll/dllglue.c ${src_game})
set_target_properties(base PROPERTIES OUTPUT_NAME "base.aros-${CMAKE_SYSTEM_PROCESSOR}") set_target_properties(base PROPERTIES OUTPUT_NAME "base.aros-${AROS_ARCH}")
else() else()
add_library(base SHARED ${src_game}) add_library(base SHARED ${src_game})
endif() endif()
@ -880,7 +885,7 @@ endif()
if(D3XP) if(D3XP)
if (AROS) if (AROS)
add_executable(d3xp sys/aros/dll/dllglue.c ${src_d3xp}) add_executable(d3xp sys/aros/dll/dllglue.c ${src_d3xp})
set_target_properties(d3xp PROPERTIES OUTPUT_NAME "d3xp.aros-${CMAKE_SYSTEM_PROCESSOR}") set_target_properties(d3xp PROPERTIES OUTPUT_NAME "d3xp.aros-${AROS_ARCH}")
else() else()
add_library(d3xp SHARED ${src_d3xp}) add_library(d3xp SHARED ${src_d3xp})
endif() endif()