Skip to content

Commit

Permalink
cmake: Remove SDL_net-related checks and substitutions
Browse files Browse the repository at this point in the history
  • Loading branch information
irydacea committed Oct 3, 2016
1 parent 99e114a commit 8b34141
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 139 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Expand Up @@ -572,9 +572,6 @@ if(ENABLE_GAME OR ENABLE_TESTS)
endif(NOT MSVC)

endif(ENABLE_GAME OR ENABLE_TESTS)
if(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_CAMPAIGN_SERVER OR ENABLE_TESTS)
find_package( SDL2_net 2.0.0 REQUIRED )
endif(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_CAMPAIGN_SERVER OR ENABLE_TESTS)
if(ENABLE_TOOLS)
find_package( ZLIB REQUIRED )
find_package( PNG REQUIRED )
Expand Down
130 changes: 0 additions & 130 deletions cmake/FindSDL2_net.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions src/CMakeLists.txt
Expand Up @@ -34,10 +34,6 @@ if(SDL2MIXER_INCLUDE_DIR)
include_directories(SYSTEM ${SDL2MIXER_INCLUDE_DIR} )
set(sdl_mixer-lib ${SDL2_MIXER_LIBRARY})
endif()
if(SDL2NET_INCLUDE_DIR)
include_directories(SYSTEM ${SDL2NET_INCLUDE_DIR} )
set(sdl_net-lib ${SDL2_NET_LIBRARY})
endif()
if(SDL2TTF_INCLUDE_DIR)
include_directories(SYSTEM ${SDL2TTF_INCLUDE_DIR} )
set(sdl_ttf-lib ${SDL2_TTF_LIBRARY})
Expand Down Expand Up @@ -143,13 +139,11 @@ endif(MSVC)

set(server-external-libs
${common-external-libs}
${sdl_net-lib}
${Boost_SYSTEM_LIBRARIES}
)

set(game-external-libs
${game-external-libs}
${sdl_net-lib}
)

set(tools-external-libs
Expand Down

0 comments on commit 8b34141

Please sign in to comment.