fix loading on windows

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5858 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/softtimer.c b/src/softtimer.c
index bc389ff35e591ad31eecaea4479258c9160bd027..cb09441d69408e162eaea70c9aa59eda19e6fe0e 100644 (file)
--- a/src/softtimer.c
+++ b/src/softtimer.c
@@ -48,6 +48,9 @@ static struct {
        switch_mutex_t *mutex;
 } globals;
 
+#undef SWITCH_MOD_DECLARE_DATA
+#define SWITCH_MOD_DECLARE_DATA __declspec(dllexport)
+
 SWITCH_MODULE_LOAD_FUNCTION(softtimer_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown);
 SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime);

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index b158699095f84acce4865c29f42ef3a00dfd16e9..40de728315ed36cd7f861077d879c543b8b62e48 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -660,7 +660,13 @@ static switch_status_t switch_loadable_module_load_file(char *path, char *filena
 
        struct_name = switch_core_sprintf(pool, "%s_module_interface", filename);
 
+#ifdef WIN32
+       status = switch_dso_load(&dso, "FreeSwitch.dll", loadable_modules.pool);
+#elif defined(DARWIN)
+       status = switch_dso_load(&dso, "libfreeswitch.dylib", loadable_modules.pool);
+#else
        status = switch_dso_load(&dso, NULL, loadable_modules.pool);
+#endif
        status = switch_dso_sym(&interface_struct_handle, dso, struct_name);
 
        if (!interface_struct_handle) {

diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index 7b9d3e5a2729e0338dd9b5cbe316a0b5ae72f43a..2f8ef920c5eb1e3ffb8665a4d1c1a6bd21c7b42e 100644 (file)
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -208,6 +208,10 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\src\softtimer.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\libs\stfu\stfu.c"\r
                                >\r
@@ -475,11 +479,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\private\switch_core.h"\r
+                               RelativePath="..\..\src\include\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\include\switch_core.h"\r
+                               RelativePath="..\..\src\include\private\switch_core.h"\r
                                >\r
                        </File>\r
                        <File\r