Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated to support manual install of libircclient

This commit is contained in:
Mark Vejvoda 2010-12-23 16:44:05 +00:00
parent cfba817280
commit c0c70217dc
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/shared_lib/CMakeLists.txt
View File

@ -49,14 +49,23 @@ if(WIN32)
endif()
else()
#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
link_directories(/usr/local/include)
link_directories(/usr/local/lib)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAMES libircclient/libircclient.h)
if(NOT LIBIRCCLIENT_INCLUDE_DIR)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAMES libircclient.h PATHS /usr/local/include)
if(LIBIRCCLIENT_INCLUDE_DIR)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBIRCCLIENTLOCAL=1")
link_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif()
endif()
endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
else()
message(STATUS "Found libircclient : [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
@ -221,7 +230,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
# [RCL] FIXME: make it compiler-agnostic
#SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
#IF(WIN32)
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WINDOWS -D_WIN32 -D_STDCALL_SUPPORTED -D_M_IX86 -DXML_LIBRARY -D_LIB -DUSE_STREFLOP -DSTREFLOP_SSE -DSTREFLOP_RANDOM_GEN_SIZE=32 -DLIBM_COMPILING_FLT32 -DCURL_STATICLIB")

4
source/shared_lib/sources/platform/posix/ircclient.cpp
View File

@ -15,7 +15,11 @@
#include "platform_common.h"
#ifndef WIN32
#ifndef _LIBIRCCLIENTLOCAL
#include <libircclient/libircclient.h>
#else
#include "libircclient.h"
#endif
#else
#include "libircclient.h"
#endif