Changeset 7329 for code/branches/ipv6/src

Timestamp:

Sep 3, 2010, 12:28:15 AM (14 years ago)

Author:

adrfried

Message:

compile with own libenet

Location:

code/branches/ipv6/src

Files:

• CMakeLists.txt (modified) (1 diff)
• external/CMakeLists.txt (modified) (1 diff)
• external/enet/CMakeLists.txt (copied) (copied from code/branches/ipv6/src/external/CMakeLists.txt) (1 diff)
• libraries/network/CMakeLists.txt (modified) (1 diff)

code/branches/ipv6/src/CMakeLists.txt

@@ -72 +72 @@
   ${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}

code/branches/ipv6/src/external/CMakeLists.txt

@@ -34 +34 @@
 ADD_SUBDIRECTORY(bullet)
 ADD_SUBDIRECTORY(cpptcl)
+ADD_SUBDIRECTORY(enet)
 ADD_SUBDIRECTORY(loki)
 ADD_SUBDIRECTORY(ogreceguirenderer)

code/branches/ipv6/src/external/enet/CMakeLists.txt

@@ -18 +18 @@
  #
 
-################ Sub Directories ################
+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
 
-ADD_SUBDIRECTORY(tolua)
+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 CEGUILua if not requested otherwise
-IF(CEGUILUA_USE_INTERNAL_LIBRARY)
-  IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
-    MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
-  ENDIF()
+INCLUDE_DIRECTORIES(include)
 
-  ADD_SUBDIRECTORY(ceguilua)
-  SET(CEGUILUA_LIBRARY ${CEGUILUA_LIBRARY} PARENT_SCOPE)
-ENDIF()
+ORXONOX_ADD_LIBRARY(enet_orxonox
+        ORXONOX_EXTERNAL
+        VERSION 1.3.0
+        SOURCE_FILES ${ENET_FILES}
+)
 
-ADD_SUBDIRECTORY(bullet)
-ADD_SUBDIRECTORY(cpptcl)
-ADD_SUBDIRECTORY(loki)
-ADD_SUBDIRECTORY(ogreceguirenderer)
-ADD_SUBDIRECTORY(ois)
-ADD_SUBDIRECTORY(tinyxml)
+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")

code/branches/ipv6/src/libraries/network/CMakeLists.txt

@@ -71 +71 @@
   LINK_LIBRARIES
     ${ZLIB_LIBRARY}
-    ${ENET_LIBRARY}
+    #${ENET_LIBRARY}
+    enet_orxonox
     ${Boost_THREAD_LIBRARY}
     util