[Orxonox-commit 2676] r7381 - in code/branches/ipv6/src: . external/enet

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-08 15:54:18 +0200 (Wed, 08 Sep 2010)
New Revision: 7381

Modified:
   code/branches/ipv6/src/CMakeLists.txt
   code/branches/ipv6/src/external/enet/CMakeLists.txt
Log:
Merely cosmetic changes.

Modified: code/branches/ipv6/src/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/CMakeLists.txt	2010-09-08 13:52:36 UTC (rev 7380)
+++ code/branches/ipv6/src/CMakeLists.txt	2010-09-08 13:54:18 UTC (rev 7381)
@@ -72,7 +72,6 @@
   ${OGRE_INCLUDE_DIR}
   ${CEGUI_INCLUDE_DIR}
   #${ENET_INCLUDE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
   ${Boost_INCLUDE_DIRS}
   ${POCO_INCLUDE_DIR}
   ${OPENAL_INCLUDE_DIRS}
@@ -91,6 +90,7 @@
   # Include directories needed even if only included by Orxonox
   ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
   ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
 
   # OrxonoxConfig.h
   ${CMAKE_CURRENT_BINARY_DIR}

Modified: code/branches/ipv6/src/external/enet/CMakeLists.txt
===================================================================
--- code/branches/ipv6/src/external/enet/CMakeLists.txt	2010-09-08 13:52:36 UTC (rev 7380)
+++ code/branches/ipv6/src/external/enet/CMakeLists.txt	2010-09-08 13:54:18 UTC (rev 7381)
@@ -18,35 +18,34 @@
  #
 
 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
+    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
+    callbacks.c
+    compress.c
+    host.c
+    list.c
+    packet.c
+    peer.c
+    protocol.c
+    unix.c
+    #win32.c
 COMPILATION_END
 )
 
-INCLUDE_DIRECTORIES(include)
+ADD_COMPILER_FLAGS("-DHAS_POLL -DHAS_FCNTL -DHAS_MSGHDR_FLAGS -DHAS_SOCKLEN_T")
 
 ORXONOX_ADD_LIBRARY(enet_orxonox
-	ORXONOX_EXTERNAL
-	VERSION 1.3.0
-	SOURCE_FILES ${ENET_FILES}
+    ORXONOX_EXTERNAL
+    VERSION        1.3.0
+    DEFINE_SYMBOL  "ENET_BUILDING_LIB"
+    SOURCE_FILES   ${ENET_FILES}
 )
-
-ADD_DEFINITIONS(-DHAS_POLL -DHAS_FCNTL -DHAS_MSGHDR_FLAGS -DHAS_SOCKLEN_T)