Skip to content

Commit

Permalink
Buildsystem/Linux: Remove -DCENTOS flag and enforce linking with ncur…
Browse files Browse the repository at this point in the history
…ses in case of older revisions of CentOS (thanks to QAston and vaska94/kingwee)

Closes issue 2908

--HG--
branch : trunk
  • Loading branch information
click committed Aug 10, 2010
1 parent b29e64b commit 4f9ec55
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,12 @@ option(GAMEPCH "Use precompiled headers when compiling game project" 1)
option(SQL "Copy SQL files during installation" 0)
option(WARNINGS "Enable all compile-warnings during compile" 0)

#
# Search for readline on *nixbased systems (CLI-handler)
#

if( UNIX )
option(CENTOS "CENTOS" 0)
if( CENTOS )
add_definitions(-DCENTOS)
find_termcap()
else()
find_readline()
endif()
find_readline()
endif()

#
Expand Down
2 changes: 1 addition & 1 deletion src/server/worldserver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ endif()
add_dependencies(worldserver genrev)

if( UNIX )
set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}")
set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
endif()

if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
Expand Down

0 comments on commit 4f9ec55

Please sign in to comment.