pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 13:33:12 +02:00
Code Activity

Update FindGettext.cmake for new Windows stuff and fix language.cpp

Browse Source 
compile
This commit is contained in:
Adam
2014-05-31 16:58:31 -04:00
parent b578e32531
commit 16e0b72d2d
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+1 -5
View File
@@ -86,11 +86,7 @@ if(WIN32)
target_link_libraries(${PROGRAM_NAME} wsock32 Ws2_32 ${LINK_LIBS} ${GETTEXT_LIBRARIES} ${WIN32_MEMORY})
set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}")
else(WIN32)
if(GETTEXT_LIBRARIES)
target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS} ${GETTEXT_LIBRARIES})
else(GETTEXT_LIBRARIES)
target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS})
endif(GETTEXT_LIBRARIES)
target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS} ${GETTEXT_LIBRARIES})
endif(WIN32)
# Building the Anope executable requires the version.h header to be generated
add_dependencies(${PROGRAM_NAME} headers)
src/language.cpp
-3
View File
@@ -76,8 +76,6 @@ const char *Language::Translate(const NickCore *nc, const char *string)
#if GETTEXT_FOUND
extern "C" int _nl_msg_cat_cntr;
const char *Language::Translate(const char *lang, const char *string)
{
if (!string || !*string)
@@ -86,7 +84,6 @@ const char *Language::Translate(const char *lang, const char *string)
if (!lang || !*lang)
lang = Config->DefLanguage.c_str();
++_nl_msg_cat_cntr;
#ifdef _WIN32
SetThreadLocale(MAKELCID(MAKELANGID(WindowsGetLanguage(lang), SUBLANG_DEFAULT), SORT_DEFAULT));
#else