Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

2 files changed, 56 insertions, 6 deletions

diff --git a/CMake/Modules/FindENet.cmake b/CMake/Modules/FindENet.cmake
new file mode 100644
index 00000000..90560063
--- /dev/null
+++ b/CMake/Modules/FindENet.cmake
@@ -0,0 +1,41 @@
+# - Try to find enet
+# Once done this will define
+#
+#  ENET_FOUND - system has enet
+#  ENET_INCLUDE_DIR - the enet include directory
+#  ENET_LIBRARIES - the libraries needed to use enet
+#  ENET_DEFINITIONS - Compiler switches required for using enet
+
+IF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
+   SET(ENet_FIND_QUIETLY TRUE)
+ENDIF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
+
+FIND_PATH(ENet_INCLUDE_DIR enet/enet.h
+    /usr/include
+    /usr/local/include
+    )
+
+FIND_LIBRARY(ENet_LIBRARY
+    NAMES enet
+    PATHS /usr/lib /usr/local/lib
+    )
+
+IF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
+    SET(ENET_FOUND TRUE)
+    SET(ENET_INCLUDE_DIR ${ENet_INCLUDE_DIR})
+    SET(ENET_LIBRARIES ${ENet_LIBRARY})
+ELSE (ENet_INCLUDE_DIR AND ENet_LIBRARY)
+    SET(ENET_FOUND FALSE)
+ENDIF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
+
+IF (ENET_FOUND)
+    IF (NOT ENet_FIND_QUIETLY)
+        MESSAGE(STATUS "Found enet: ${ENet_LIBRARY}")
+    ENDIF (NOT ENet_FIND_QUIETLY)
+ELSE (ENET_FOUND)
+    IF (ENet_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could NOT find enet")
+    ENDIF (ENet_FIND_REQUIRED)
+ENDIF (ENET_FOUND)
+
+MARK_AS_ADVANCED(ENet_INCLUDE_DIR ENet_LIBRARY)
diff --git a/CMake/Modules/FindGuichan.cmake b/CMake/Modules/FindGuichan.cmake
index fccfc499..b0cb9038 100644
--- a/CMake/Modules/FindGuichan.cmake
+++ b/CMake/Modules/FindGuichan.cmake
@@ -17,7 +17,6 @@ IF (Guichan_INCLUDE_DIR AND Guichan_LIBRARY)
     SET(Guichan_QUIET TRUE)
 ENDIF (Guichan_INCLUDE_DIR AND Guichan_LIBRARY)
 
-
 FIND_PATH(Guichan_INCLUDE_DIR
     NAMES guichan.hpp
     PATHS /usr/include /usr/local/include
@@ -53,15 +52,25 @@ FOREACH (COMPONENT ${Guichan_FIND_COMPONENTS})
 
     IF (COMPONENT STREQUAL "SDL")
         SET(COMPONENT_FOUND TRUE)
-        SET(Guichan_HEADER "guichan/sdl.hpp")
-        SET(Guichan_LIBRARY "guichan_sdl")
+	IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+		SET(Guichan_HEADER "sdl.hpp")
+		SET(Guichan_LIBRARY_${COMPONENT} TRUE)
+	ELSE (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+		SET(Guichan_HEADER "guichan/sdl.hpp")
+        	SET(Guichan_LIBRARY "guichan_sdl")
+	ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     ENDIF (COMPONENT STREQUAL "SDL")
 
     IF (COMPONENT STREQUAL "OpenGL")
         SET(COMPONENT_FOUND TRUE)
-        SET(Guichan_HEADER "guichan/opengl.hpp")
-        SET(Guichan_LIBRARY "guichan_opengl")
-    ENDIF (COMPONENT STREQUAL "OpenGL")
+	IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+		SET(Guichan_HEADER "opengl.hpp")
+		SET(Guichan_LIBRARY_${COMPONENT} TRUE)
+	ELSE (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+		SET(Guichan_HEADER "guichan/opengl.hpp")
+        	SET(Guichan_LIBRARY "guichan_opengl")
+	ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   ENDIF (COMPONENT STREQUAL "OpenGL")
 
     IF (NOT COMPONENT_FOUND)
         MESSAGE(FATAL_ERROR "Invalid Guichan component: ${COMPONENT}")