Blob Blame History Raw
diff -uNr supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake supertuxkart-0.9.1/cmake/FindENet.cmake
--- supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake	1970-01-01 01:00:00.000000000 +0100
+++ supertuxkart-0.9.1/cmake/FindENet.cmake	2015-10-19 20:09:36.174150131 +0200
@@ -0,0 +1,49 @@
+# - Try to find enet
+# Once done this will define
+#
+#  ENET_FOUND - system has enet
+#  ENet_INCLUDE_DIRS - the enet include directory
+#  ENet_LIBRARIES - the libraries needed to use enet
+#
+# $ENETDIR is an environment variable used for finding enet.
+#
+#  Borrowed from The Mana World
+#  http://themanaworld.org/
+#
+# Several changes and additions by Fabian 'x3n' Landau
+# Lots of simplifications by Adrian Friedli
+#                 > www.orxonox.net <
+
+FIND_PATH(ENet_INCLUDE_DIRS enet/enet.h
+    PATHS
+    $ENV{ENETDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+    )
+
+FIND_LIBRARY(ENet_LIBRARY
+    NAMES enet
+    PATHS
+    $ENV{ENETDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+    )
+
+# handle the QUIETLY and REQUIRED arguments and set ENET_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENet DEFAULT_MSG ENet_LIBRARY ENet_INCLUDE_DIRS)
+
+IF (ENET_FOUND)
+    IF(WIN32)
+        SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
+        SET(ENet_LIBRARIES ${ENet_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
+    ELSE(WIN32)
+        SET(ENet_LIBRARIES ${ENet_LIBRARY})
+    ENDIF(WIN32)
+ENDIF (ENET_FOUND)
+
+MARK_AS_ADVANCED(ENet_LIBRARY ENet_LIBRARIES ENet_INCLUDE_DIRS)
+
diff -uNr supertuxkart-0.9.1.wiiuse/CMakeLists.txt supertuxkart-0.9.1/CMakeLists.txt
--- supertuxkart-0.9.1.wiiuse/CMakeLists.txt	2015-10-19 20:08:21.035417630 +0200
+++ supertuxkart-0.9.1/CMakeLists.txt	2015-10-19 20:09:36.177150839 +0200
@@ -63,8 +63,8 @@
 include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
 
 # Build the ENet UDP network library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
+find_package(ENet REQUIRED)
+include_directories(${ENet_INCLUDE_DIRS})
 
 # Build glew library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
@@ -330,7 +330,7 @@
     bulletdynamics
     bulletcollision
     bulletmath
-    enet
+    ${ENet_LIBRARIES}
     glew
     stkirrlicht
     ${Angelscript_LIBRARIES}