Changeset 7381 for code

Timestamp:

Sep 8, 2010, 3:54:18 PM (14 years ago)

Author:

rgrieder

Message:

Merely cosmetic changes.

Location:

code/branches/ipv6/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• external/enet/CMakeLists.txt (modified) (1 diff)

code/branches/ipv6/src/CMakeLists.txt

@@ -73 +73 @@
   ${CEGUI_INCLUDE_DIR}
   #${ENET_INCLUDE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
   ${Boost_INCLUDE_DIRS}
   ${POCO_INCLUDE_DIR}
@@ -92 +91 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
   ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/enet/include
 
   # OrxonoxConfig.h

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

@@ -19 +19 @@
 
 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)