From fa358bcce18c4c6b343eb2a82475d76a6638096a Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 29 Oct 2018 01:24:34 +0100 Subject: Use system specific extension for generated files --- backend/ninja/Ninja.cpp | 8 ++++---- include/Conf.hpp | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index 9a8dc25..6aad314 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -1472,12 +1472,12 @@ namespace backend case Compiler::MINGW_W64: case Compiler::GCC: { - generatedFile = "lib" + config.getPackageName() + ".a"; + generatedFile = "lib" + config.getPackageName() + "." + CONFIG_STATIC_LIB_FILE_EXTENSION; break; } case Compiler::MSVC: { - generatedFile = config.getPackageName() + ".lib"; + generatedFile = config.getPackageName() + "." + CONFIG_STATIC_LIB_FILE_EXTENSION; break; } } @@ -1551,12 +1551,12 @@ namespace backend case Compiler::MINGW_W64: case Compiler::GCC: { - generatedFile = "lib" + config.getPackageName() + ".so"; + generatedFile = "lib" + config.getPackageName() + "." + CONFIG_DYNAMIC_LIB_FILE_EXTENSION; break; } case Compiler::MSVC: { - generatedFile = config.getPackageName() + ".dll"; + generatedFile = config.getPackageName() + "." + CONFIG_DYNAMIC_LIB_FILE_EXTENSION; break; } } diff --git a/include/Conf.hpp b/include/Conf.hpp index ee61a21..39978a1 100644 --- a/include/Conf.hpp +++ b/include/Conf.hpp @@ -155,7 +155,11 @@ namespace sibs const Platform SYSTEM_PLATFORM = PLATFORM_LINUX64; #endif #define CONFIG_STATIC_LIB_FILE_EXTENSION "a" - #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "so" + #ifdef __CYGWIN__ + #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "dll" + #else + #define CONFIG_DYNAMIC_LIB_FILE_EXTENSION "so" + #endif #elif OS_TYPE == OS_TYPE_APPLE #ifdef SIBS_ENV_32BIT const Platform SYSTEM_PLATFORM = PLATFORM_MACOS32; -- cgit v1.2.3