Changeset 539

Timestamp:

Dec 16, 2007, 2:04:21 AM (16 years ago)

Author:

nicolasc

Message:

• standardized FindZLIB.cmake
• minor cleanup in Media

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• Media/materials/textures/bigflame.png (added)
• Media/materials/textures/black.png (added)
• Media/materials/textures/explosion.png (added)
• Media/materials/textures/flaretrail.png (added)
• Media/materials/textures/human_assf.png (modified) (previous)
• Media/materials/textures/ring_flare.png (added)
• Media/materials/textures/ring_flare2.png (added)
• Media/materials/textures/streak.png (added)
• Media/textures (deleted)
• bin/resources.cfg (modified) (1 diff)
• cmake/FindZLIB.cmake (moved) (moved from code/branches/FICN/cmake/FindZlib.cmake) (2 diffs)
• src/network/CMakeLists.txt (modified) (3 diffs)
• src/orxonox/orxonox.cc (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -64 +64 @@
 FIND_PACKAGE(ALUT)
 FIND_PACKAGE(OggVorbis)
-FIND_PACKAGE(Zlib)
+FIND_PACKAGE(ZLIB)
 
 IF(WIN32)

code/branches/FICN/bin/resources.cfg

@@ -11 +11 @@
 FileSystem=../Media/materials/scripts
 FileSystem=../Media/materials/textures
-#FileSystem=../Media/material
 FileSystem=../Media/models
 FileSystem=../Media/overlay

code/branches/FICN/cmake/FindZLIB.cmake

@@ +1 @@
+# - Find zlib
+# Find the native ZLIB includes and library
+#
+#  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
+#  ZLIB_LIBRARIES   - List of libraries when using zlib.
+#  ZLIB_FOUND       - True if zlib found.
+#
+#  Modified by Nicolas Schlumberger, (c) 2007
+#  to make it work on the Tardis Infrastucture of the ETH Zurich
+#
+
+IF(UNIX)
+  IF (ZLIB_INCLUDE_DIR)
+  # Already in cache, be silent
+    SET(ZLIB_FIND_QUIETLY TRUE)
+  ENDIF (ZLIB_INCLUDE_DIR)
+
+  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+    /usr/pack/zziplib-0.13.49-sd/include/
+    /usr/local/include
+    /usr/include
+  )
+
+  SET(ZLIB_NAMES z zlib zdll)
+  FIND_LIBRARY(ZLIB_LIBRARY
+    NAMES ${ZLIB_NAMES}
+    PATHS /usr/pack/zziplib-0.13.49-sd/i686-debian-linux3.1/lib/ /usr/lib /usr/local/lib
+  )
+
+  IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+    SET(ZLIB_FOUND TRUE)
+      SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+  ELSE (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+    SET(ZLIB_FOUND FALSE)
+    SET( ZLIB_LIBRARIES )
+  ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+
+  IF (ZLIB_FOUND)
+    IF (NOT ZLIB_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ZLIB: ${ZLIB_LIBRARY}")
+    ENDIF (NOT ZLIB_FIND_QUIETLY)
+  ELSE (ZLIB_FOUND)
+    IF (ZLIB_FIND_REQUIRED)
+        MESSAGE(STATUS "Looked for Z libraries named ${ZLIBS_NAMES}.")
+        MESSAGE(FATAL_ERROR "Could NOT find z library")
+    ENDIF (ZLIB_FIND_REQUIRED)
+  ENDIF (ZLIB_FOUND)
+
+  MARK_AS_ADVANCED(
+    ZLIB_LIBRARY
+    ZLIB_INCLUDE_DIR
+  )
+ENDIF(UNIX)
+
 IF(WIN32)
   IF(EXISTS "../libs/ogre/Dependencies/lib/Release")
-    SET (Zlib_LIBRARY_DIR "../libs/ogre/Dependencies/lib/Release")
+    SET (ZLIB_LIBRARY_DIR "../libs/ogre/Dependencies/lib/Release")
   ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release")
 
-  FIND_LIBRARY(Zlib_LIBRARY
+  FIND_LIBRARY(ZLIB_LIBRARY
     NAMES zlib
     PATHS ${Zlib_LIBRARY_DIR}
@@ -13 +67 @@
   ELSE(Zlib_LIBRARY)
     MESSAGE(FATAL_ERROR "Zlib was NOT found.")
-  ENDIF(Zlib_LIBRARY)
+  ENDIF(ZLIB_LIBRARY)
 ENDIF(WIN32)

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

@@ -35 +35 @@
 
 ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
-TARGET_LINK_LIBRARIES(network ${Zlib_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
+TARGET_LINK_LIBRARIES(network ${ZLIB_LIBRARY} ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
 
 ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
@@ -44 +44 @@
   #objects
   ${ENet_LIBRARY}
-  ${Zlib_LIBRARY}
+  ${ZLIB_LIBRARY}
   ${WINDOWS_ENET_DEPENDENCIES}
 )
@@ -55 +55 @@
   #objects
   ${ENet_LIBRARY}
-  ${Zlib_LIBRARY}
+  ${ZLIB_LIBRARY}
   ${WINDOWS_ENET_DEPENDENCIES}
 )

code/branches/FICN/src/orxonox/orxonox.cc

@@ -67 +67 @@
 #include "../network/Client.h"
 #include "../network/NetworkFrameListener.h"
-
-// some tests to see if enet works without includsion
-//#include <enet/enet.h>
-//#include <enet/protocol.h>