diff options
| author | Adam <Adam@anope.org> | 2013-04-12 17:19:29 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-04-12 17:19:29 -0400 |
| commit | b405484fb9f3039a5995550b2dff85d123875dee (patch) | |
| tree | 33701261d24d74afd28c20e6f194e3ecc2ed25bc | |
| parent | 9a456263792769490c244e0cf46450a33ed14a91 (diff) | |
Fix OSX buld and a warning in modulemanager.cpp
| -rw-r--r-- | modules/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/modulemanager.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 5a02b16b4..1ec4e1087 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -84,12 +84,15 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) if(GETTEXT_FOUND) add_dependencies(${SO} module_language) endif(GETTEXT_FOUND) + target_link_libraries(${SO} ${TEMP_DEPENDENCIES}) # For Windows only, have the module link to the export library of Anope as well as wsock32 and Ws2_32 libraries (most of the modules probably don't need this, but this is to be on the safe side), also set it's version if(WIN32) - target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${TEMP_DEPENDENCIES}) + target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") else(WIN32) - target_link_libraries(${SO} ${TEMP_DEPENDENCIES}) + if(APPLE) + target_link_libraries(${SO} ${PROGRAM_NAME}) + endif(APPLE) endif(WIN32) # Set the module to be installed to the module directory under the data directory install(TARGETS ${SO} diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index f27561fa6..82691822f 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -465,7 +465,7 @@ bool ModuleManager::SetPriority(Module *mod, Implementation i, Priority s, Modul for (unsigned j = source; j != swap_pos; j += incrmnt) { - if (j + incrmnt > EventHandlers[i].size() - 1 || j + incrmnt < 0) + if (j + incrmnt > EventHandlers[i].size() - 1 || (!j && incrmnt == -1)) continue; std::swap(EventHandlers[i][j], EventHandlers[i][j + incrmnt]); |