Changeset 295 for code/branches/merger

Timestamp:

Nov 28, 2007, 1:05:53 AM (17 years ago)

Author:

nicolasc

Message:

minor fixes

Location:

code/branches/merger

Files:

• cmake/FindENet.cmake (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (1 diff)

code/branches/merger/cmake/FindENet.cmake

@@ -18 +18 @@
     /usr/include
     /usr/local/include
+    /usr/pack/enet-2007-sd/include
     )
 
 FIND_LIBRARY(ENet_LIBRARY
     NAMES enet
-    PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/include/
+    PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/
     )
 

code/branches/merger/src/network/CMakeLists.txt

@@ -2 +2 @@
 
 SET(SRC_FILES Client.cc ConnectionManager.cc PacketBuffer.cc PacketGenerator.cc Synchronisable.cc dummyclient2.cc ClientConnection.cc GameStateManager.cc PacketDecoder.cc Server.cc dummyclient.cc dummyserver.cc)
-SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h)
+SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h ${ENet_INCLUDE_DIR})
 
 ADD_LIBRARY(network ${SRC_FILES} ${INC_FILES})