[Freeswitch-svn] [commit] r5858 - in freeswitch/trunk: src w32/Library

[Freeswitch SVN]

Author: mikej
Date: Fri Oct 12 18:54:18 2007
New Revision: 5858

Modified:
   freeswitch/trunk/src/softtimer.c
   freeswitch/trunk/src/switch_loadable_module.c
   freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj

Log:
fix loading on windows

Modified: freeswitch/trunk/src/softtimer.c
==============================================================================
--- freeswitch/trunk/src/softtimer.c	(original)
+++ freeswitch/trunk/src/softtimer.c	Fri Oct 12 18:54:18 2007
@@ -48,6 +48,9 @@
 	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);

Modified: freeswitch/trunk/src/switch_loadable_module.c
==============================================================================
--- freeswitch/trunk/src/switch_loadable_module.c	(original)
+++ freeswitch/trunk/src/switch_loadable_module.c	Fri Oct 12 18:54:18 2007
@@ -660,7 +660,13 @@
 
 	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) {

Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj
==============================================================================
--- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	(original)
+++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj	Fri Oct 12 18:54:18 2007
@@ -209,6 +209,10 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
+				RelativePath="..\..\src\softtimer.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\libs\stfu\stfu.c"
 				>
 				<FileConfiguration
@@ -475,11 +479,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\include\private\switch_core.h"
+				RelativePath="..\..\src\include\switch_core.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\include\switch_core.h"
+				RelativePath="..\..\src\include\private\switch_core.h"
 				>
 			</File>
 			<File