aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-29 01:24:34 +0100
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:33 +0200
commitfa358bcce18c4c6b343eb2a82475d76a6638096a (patch)
tree551860f79dd069c61fcff666e938d73d73e731c3
parentcc0f3bf97a5138e8c4f2e121f304eda7beac56a9 (diff)
Use system specific extension for generated files
-rw-r--r--backend/ninja/Ninja.cpp8
-rw-r--r--include/Conf.hpp6
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;