From fadfe4cdf961d614a52850e81b1d4a333c6b4710 Mon Sep 17 00:00:00 2001 From: Kalamatee Date: Wed, 10 Aug 2016 01:46:43 +0100 Subject: [PATCH] use the correct extension for x86 --- neo/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index afa4a570..1461f951 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -780,6 +780,11 @@ include_directories(${CMAKE_SOURCE_DIR}) add_library(idlib STATIC ${src_idlib}) if (AROS) 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() if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MINGW) set_target_properties(idlib PROPERTIES COMPILE_FLAGS "-fPIC") @@ -853,7 +858,7 @@ endif() if(BASE) if (AROS) 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() add_library(base SHARED ${src_game}) endif() @@ -880,7 +885,7 @@ endif() if(D3XP) if (AROS) 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() add_library(d3xp SHARED ${src_d3xp}) endif()