[Orxonox-commit 2624] r7329 - in code/branches/ipv6: cmake src src/external src/external/enet src/libraries/network

[adrfried at orxonox.net]

Author: adrfried
Date: 2010-09-03 00:28:15 +0200 (Fri, 03 Sep 2010)
New Revision: 7329

Added:
   code/branches/ipv6/src/external/enet/CMakeLists.txt
Modified:
   code/branches/ipv6/cmake/LibraryConfig.cmake
   code/branches/ipv6/src/CMakeLists.txt
   code/branches/ipv6/src/external/CMakeLists.txt
   code/branches/ipv6/src/libraries/network/CMakeLists.txt
Log:
compile with own libenet

Modified: code/branches/ipv6/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/ipv6/cmake/LibraryConfig.cmake	2010-09-02 22:28:07 UTC (rev 7328)
+++ code/branches/ipv6/cmake/LibraryConfig.cmake	2010-09-02 22:28:15 UTC (rev 7329)
@@ -93,7 +93,7 @@
 # Performs the search and sets the variables    #
 
 FIND_PACKAGE(OGRE  1.4       REQUIRED)
-FIND_PACKAGE(ENet  1.1       REQUIRED)
+#FIND_PACKAGE(ENet  1.1       REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
 FIND_PACKAGE(Vorbis          REQUIRED)
 FIND_PACKAGE(ALUT            REQUIRED)

Modified: code/branches/ipv6/src/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/CMakeLists.txt	2010-09-02 22:28:07 UTC (rev 7328)
+++ code/branches/ipv6/src/CMakeLists.txt	2010-09-02 22:28:15 UTC (rev 7329)
@@ -71,7 +71,8 @@
   # External
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
-  ${ENET_INCLUDE_DIR}
+  #${ENET_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
   ${Boost_INCLUDE_DIRS}
   ${POCO_INCLUDE_DIR}
   ${OPENAL_INCLUDE_DIRS}

Modified: code/branches/ipv6/src/external/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/external/CMakeLists.txt	2010-09-02 22:28:07 UTC (rev 7328)
+++ code/branches/ipv6/src/external/CMakeLists.txt	2010-09-02 22:28:15 UTC (rev 7329)
@@ -33,6 +33,7 @@
 
 ADD_SUBDIRECTORY(bullet)
 ADD_SUBDIRECTORY(cpptcl)
+ADD_SUBDIRECTORY(enet)
 ADD_SUBDIRECTORY(loki)
 ADD_SUBDIRECTORY(ogreceguirenderer)
 ADD_SUBDIRECTORY(ois)

Copied: code/branches/ipv6/src/external/enet/CMakeLists.txt (from rev 7328, code/branches/ipv6/src/external/CMakeLists.txt)
===================================================================
--- code/branches/ipv6/src/external/enet/CMakeLists.txt	                        (rev 0)
+++ code/branches/ipv6/src/external/enet/CMakeLists.txt	2010-09-02 22:28:15 UTC (rev 7329)
@@ -0,0 +1,55 @@
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+
+SET_SOURCE_FILES(ENET_FILES
+	include/enet/callbacks.h
+	include/enet/enet.h
+	include/enet/list.h
+	include/enet/protocol.h
+	include/enet/time.h
+	include/enet/types.h
+	include/enet/unix.h
+	include/enet/utility.h
+	#include/enet/win32.h
+
+COMPILATION_BEGIN ENetCompilation.cpp
+	callbacks.c
+	compress.c
+	host.c
+	list.c
+	packet.c
+	peer.c
+	protocol.c
+	unix.c
+	#win32.c
+COMPILATION_END
+)
+
+INCLUDE_DIRECTORIES(include)
+
+ORXONOX_ADD_LIBRARY(enet_orxonox
+	ORXONOX_EXTERNAL
+	VERSION 1.3.0
+	SOURCE_FILES ${ENET_FILES}
+)
+
+SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_POLL")
+SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_FCNTL")
+SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_MSGHDR_FLAGS")
+SET_TARGET_PROPERTIES(enet_orxonox PROPERTIES DEFINE_SYMBOL "HAS_SOCKLEN_T")

Modified: code/branches/ipv6/src/libraries/network/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/libraries/network/CMakeLists.txt	2010-09-02 22:28:07 UTC (rev 7328)
+++ code/branches/ipv6/src/libraries/network/CMakeLists.txt	2010-09-02 22:28:15 UTC (rev 7329)
@@ -70,7 +70,8 @@
     NetworkPrecompiledHeaders.h
   LINK_LIBRARIES
     ${ZLIB_LIBRARY}
-    ${ENET_LIBRARY}
+    #${ENET_LIBRARY}
+    enet_orxonox
     ${Boost_THREAD_LIBRARY}
     util
     core