[beast/win32: 27/44] Use ".so" as plugin extension under Unix and ".dll" under windows.
- From: Stefan Westerfeld <stw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [beast/win32: 27/44] Use ".so" as plugin extension under Unix and ".dll" under windows.
- Date: Fri, 29 Jan 2010 16:23:41 +0000 (UTC)
commit 87cb998baa20416e6d00331795849bb701145985
Author: Stefan Westerfeld <stefan space twc de>
Date: Fri Sep 4 19:25:57 2009 +0200
Use ".so" as plugin extension under Unix and ".dll" under windows.
Changes based on 010_plugin_ext_crawler.diff.
bse/bseplugin.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/bse/bseplugin.c b/bse/bseplugin.c
index e6c2718..e73be5a 100644
--- a/bse/bseplugin.c
+++ b/bse/bseplugin.c
@@ -734,6 +734,12 @@ plugin_extension_filter (const char *fname,
return false;
}
+#ifdef WIN32
+#define PLUGIN_EXTENSION ".dll"
+#else
+#define PLUGIN_EXTENSION ".so"
+#endif
+
SfiRing*
bse_plugin_path_list_files (gboolean include_drivers,
gboolean include_plugins)
@@ -749,21 +755,21 @@ bse_plugin_path_list_files (gboolean include_drivers,
{
if (include_drivers)
{
- files = sfi_file_crawler_list_files (BSE_PATH_DRIVERS, "*.so", G_FILE_TEST_IS_REGULAR);
+ files = sfi_file_crawler_list_files (BSE_PATH_DRIVERS, "*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
files = sfi_file_crawler_list_files (BSE_PATH_DRIVERS, "*.o", G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
}
if (include_plugins)
{
- files = sfi_file_crawler_list_files (BSE_PATH_PLUGINS, "*.so", G_FILE_TEST_IS_REGULAR);
+ files = sfi_file_crawler_list_files (BSE_PATH_PLUGINS, "*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
files = sfi_file_crawler_list_files (BSE_PATH_PLUGINS, "*.o", G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
}
if (include_plugins && BSE_GCONFIG (plugin_path) && BSE_GCONFIG (plugin_path)[0])
{
- files = sfi_file_crawler_list_files (BSE_GCONFIG (plugin_path), "*.so", G_FILE_TEST_IS_REGULAR);
+ files = sfi_file_crawler_list_files (BSE_GCONFIG (plugin_path), "*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
files = sfi_file_crawler_list_files (BSE_GCONFIG (plugin_path), "*.o", G_FILE_TEST_IS_REGULAR);
ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
@@ -775,11 +781,11 @@ bse_plugin_path_list_files (gboolean include_drivers,
if (true)
{
const SfiCPUInfo cpu_info = sfi_cpu_info();
- const char *exts[] = { ".FPU.so", ".FPU.la", ".so", ".la", };
+ const char *exts[] = { ".FPU" PLUGIN_EXTENSION, ".FPU.la", PLUGIN_EXTENSION, ".la", };
if (BSE_WITH_SSE_FLAGS && !bse_main_args->force_fpu &&
cpu_info.x86_mmx && cpu_info.x86_sse && cpu_info.x86_ssesys)
{
- exts[0] = ".SSE.so"; /* !".FPU.so" */
+ exts[0] = ".SSE" PLUGIN_EXTENSION; /* !".FPU.so" / ".FPU.dll" */
exts[1] = ".SSE.la"; /* !".FPU.la" */
}
SfiRing *fname;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]