Index: nelns/CMakeModules/FindMySQL.cmake
===================================================================
--- nelns/CMakeModules/FindMySQL.cmake	(revision 1575)
+++ nelns/CMakeModules/FindMySQL.cmake	(working copy)
@@ -18,6 +18,7 @@
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
       /usr/include/mysql
       /usr/local/include/mysql
+      /opt/local/include/mysql5/mysql
       $ENV{ProgramFiles}/MySQL/*/include
       $ENV{SystemDrive}/MySQL/*/include)
 
@@ -33,6 +34,7 @@
       /usr/local/lib
       /usr/lib/mysql
       /usr/local/lib/mysql
+      /opt/local/lib/mysql5/mysql
       )
   ENDIF(WIN32 AND MSVC)
 
Index: nelns/CMakeModules/nel.cmake
===================================================================
--- nelns/CMakeModules/nel.cmake	(revision 1575)
+++ nelns/CMakeModules/nel.cmake	(working copy)
@@ -119,7 +119,11 @@
     IF(WITH_COVERAGE)
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
     ENDIF(WITH_COVERAGE)
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    IF(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
+    ELSE(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    ENDIF(APPLE)
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
Index: snowballs2/CMakeModules/nel.cmake
===================================================================
--- snowballs2/CMakeModules/nel.cmake	(revision 1575)
+++ snowballs2/CMakeModules/nel.cmake	(working copy)
@@ -115,7 +115,11 @@
     SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
   ELSE(WIN32)
     SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    IF(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
+    ELSE(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    ENDIF(APPLE)
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
Index: snowballs2/CMakeLists.txt
===================================================================
--- snowballs2/CMakeLists.txt	(revision 1575)
+++ snowballs2/CMakeLists.txt	(working copy)
@@ -68,6 +68,7 @@
 
 FIND_PACKAGE(Threads REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
+FIND_PACKAGE(PNG REQUIRED)
 
 NL_SETUP_BUILD()
 
Index: snowballs2/client/src/CMakeLists.txt
===================================================================
--- snowballs2/client/src/CMakeLists.txt	(revision 1575)
+++ snowballs2/client/src/CMakeLists.txt	(working copy)
@@ -2,7 +2,7 @@
 
 ADD_EXECUTABLE(snowballs ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(snowballs ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELPACS_LIBRARY} ${NELNET_LIBRARY} ${NELSOUND_LIBRARY} ${NELSNDDRV_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} ${NEL3D_LIBRARY} ${JPEG_LIBRARY} ${FREETYPE_LIBRARY})
 IF(WIN32)
   SET_TARGET_PROPERTIES(snowballs PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/src/sound/driver/openal/stdopenal.h
===================================================================
--- nel/src/sound/driver/openal/stdopenal.h	(revision 1575)
+++ nel/src/sound/driver/openal/stdopenal.h	(working copy)
@@ -38,8 +38,13 @@
 #include <utility>
 #include <deque>
 
-#include <AL/al.h>
-#include <AL/alc.h>
+#ifndef NL_OS_MAC
+# include <AL/al.h>
+# include <AL/alc.h>
+#else
+# include <al.h>
+# include <alc.h>
+#endif
 
 #include <nel/misc/common.h>
 #include <nel/misc/debug.h>
Index: nel/src/sound/CMakeLists.txt
===================================================================
--- nel/src/sound/CMakeLists.txt	(revision 1575)
+++ nel/src/sound/CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h driver/sound_driver.cpp driver/buffer.cpp)
 
 DECORATE_NEL_LIB("nelsound")
 SET(NLSOUND_LIB ${LIBNAME})
@@ -15,7 +15,8 @@
   ADD_LIBRARY(${NLSOUND_LIB} STATIC ${SRC})
 ENDIF(NOT WIN32) 
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
+
 TARGET_LINK_LIBRARIES(${NLSOUND_LIB} ${LIBXML2_LIBRARIES} ${NLLIGO_LIB} ${NLGEORGES_LIB} ${NL3D_LIB})
 SET_TARGET_PROPERTIES(${NLSOUND_LIB} PROPERTIES VERSION ${NL_VERSION})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
Index: nel/src/misc/dynloadlib.cpp
===================================================================
--- nel/src/misc/dynloadlib.cpp	(revision 1575)
+++ nel/src/misc/dynloadlib.cpp	(working copy)
@@ -75,6 +75,9 @@
 #ifdef NL_OS_WINDOWS
   const string	nlLibPrefix;	// empty
   const string	nlLibExt(".dll");
+#elif defined(NL_OS_MAC)
+  const string	nlLibPrefix("lib");
+  const string	nlLibExt(".dylib");
 #elif defined(NL_OS_UNIX)
   const string	nlLibPrefix("lib");
   const string	nlLibExt(".so");
Index: nel/src/logic/CMakeLists.txt
===================================================================
--- nel/src/logic/CMakeLists.txt	(revision 1575)
+++ nel/src/logic/CMakeLists.txt	(working copy)
@@ -4,6 +4,8 @@
 SET(NLLOGIC_LIB ${LIBNAME})
 DECORATE_NEL_LIB("nelmisc")
 SET(NLMISC_LIB ${LIBNAME})
+DECORATE_NEL_LIB("nelnet")
+SET(NLNET_LIB ${LIBNAME})
 
 IF(NOT WIN32)
   ADD_LIBRARY(${NLLOGIC_LIB} SHARED ${SRC})
@@ -12,7 +14,9 @@
 ENDIF(NOT WIN32)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(${NLLOGIC_LIB} ${LIBXML2_LIBRARIES} ${NLMISC_LIB})
+
+TARGET_LINK_LIBRARIES(${NLLOGIC_LIB} ${LIBXML2_LIBRARIES} ${NLMISC_LIB} ${NLNET_LIB})
+
 SET_TARGET_PROPERTIES(${NLLOGIC_LIB} PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)
Index: nel/src/3d/driver/opengl/CMakeLists.txt
===================================================================
--- nel/src/3d/driver/opengl/CMakeLists.txt	(revision 1575)
+++ nel/src/3d/driver/opengl/CMakeLists.txt	(working copy)
@@ -11,8 +11,11 @@
 
 ADD_LIBRARY(${NLDRV_OGL_LIB} SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${NL3D_LIB} ${OPENGL_LIBRARIES})
+SET(MY_OPENGL_INCLUDE_DIR "/usr/X11/include")
+SET(MY_OPENGL_LIBRARIES "-L/usr/X11/lib -lX11 -lGL -framework Foundation -framework Carbon")
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${MY_OPENGL_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${NL3D_LIB} ${OPENGL_LIBRARIES} ${MY_OPENGL_LIBRARIES})
+
 SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES VERSION ${NL_VERSION})
 
 IF(WIN32)
Index: nel/tools/3d/build_clodtex/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_clodtex/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_clodtex/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_clodtex ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_clodtex ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_clodtex PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/build_far_bank/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_far_bank/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_far_bank/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_far_bank ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_far_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_far_bank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/tga_cut/CMakeLists.txt
===================================================================
--- nel/tools/3d/tga_cut/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/tga_cut/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(tga_cut ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(tga_cut ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(tga_cut PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/file_info/CMakeLists.txt
===================================================================
--- nel/tools/3d/file_info/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/file_info/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(file_info ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(file_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(file_info PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/build_clod_bank/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_clod_bank/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_clod_bank/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_clod_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_clod_bank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zviewer/CMakeLists.txt
===================================================================
--- nel/tools/3d/zviewer/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zviewer/CMakeLists.txt	(working copy)
@@ -11,7 +11,7 @@
 
 ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zviewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zviewer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/ig_lighter/CMakeLists.txt
===================================================================
--- nel/tools/3d/ig_lighter/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/ig_lighter/CMakeLists.txt	(working copy)
@@ -7,7 +7,7 @@
 
 ADD_EXECUTABLE(ig_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLPACS_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(ig_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zone_welder/CMakeLists.txt
===================================================================
--- nel/tools/3d/zone_welder/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zone_welder/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(zone_welder ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zone_welder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zone_welder PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/build_interface/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_interface/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_interface/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_interface ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_interface ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_interface PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zone_dependencies/CMakeLists.txt
===================================================================
--- nel/tools/3d/zone_dependencies/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zone_dependencies/CMakeLists.txt	(working copy)
@@ -7,7 +7,7 @@
 
 ADD_EXECUTABLE(zone_dependencies ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zone_dependencies ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLGEORGES_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zone_dependencies PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/build_shadow_skin/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_shadow_skin/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_shadow_skin/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_shadow_skin ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_shadow_skin PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zone_lighter/CMakeLists.txt
===================================================================
--- nel/tools/3d/zone_lighter/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zone_lighter/CMakeLists.txt	(working copy)
@@ -7,7 +7,7 @@
 
 ADD_EXECUTABLE(zone_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zone_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLGEORGES_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zone_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/tga_resize/CMakeLists.txt
===================================================================
--- nel/tools/3d/tga_resize/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/tga_resize/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(tga_resize ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(tga_resize ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(tga_resize PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zone_dump/CMakeLists.txt
===================================================================
--- nel/tools/3d/zone_dump/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zone_dump/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(zone_dump ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zone_dump ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zone_dump PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/cluster_viewer/CMakeLists.txt
===================================================================
--- nel/tools/3d/cluster_viewer/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/cluster_viewer/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(cluster_viewer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(cluster_viewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(cluster_viewer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/tools/3d/build_coarse_mesh/CMakeLists.txt
===================================================================
--- nel/tools/3d/build_coarse_mesh/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/build_coarse_mesh/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_coarse_mesh ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_coarse_mesh PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/3d/zone_ig_lighter/CMakeLists.txt
===================================================================
--- nel/tools/3d/zone_ig_lighter/CMakeLists.txt	(revision 1575)
+++ nel/tools/3d/zone_ig_lighter/CMakeLists.txt	(working copy)
@@ -5,7 +5,7 @@
 
 ADD_EXECUTABLE(zone_ig_lighter ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(zone_ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(zone_ig_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/pacs/build_rbank/CMakeLists.txt
===================================================================
--- nel/tools/pacs/build_rbank/CMakeLists.txt	(revision 1575)
+++ nel/tools/pacs/build_rbank/CMakeLists.txt	(working copy)
@@ -11,7 +11,7 @@
 
 ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB} ${NLLIGO_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_rbank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/tools/pacs/build_ig_boxes/CMakeLists.txt
===================================================================
--- nel/tools/pacs/build_ig_boxes/CMakeLists.txt	(revision 1575)
+++ nel/tools/pacs/build_ig_boxes/CMakeLists.txt	(working copy)
@@ -9,7 +9,7 @@
 
 ADD_DEFINITIONS(-DNL_BIB_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(build_ig_boxes ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(build_ig_boxes PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
Index: nel/samples/3d/shape_viewer/CMakeLists.txt
===================================================================
--- nel/samples/3d/shape_viewer/CMakeLists.txt	(revision 1575)
+++ nel/samples/3d/shape_viewer/CMakeLists.txt	(working copy)
@@ -7,7 +7,7 @@
 
 ADD_EXECUTABLE(nl_sample_shapeview ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_shapeview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(nl_sample_shapeview PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/samples/3d/cluster_viewer/CMakeLists.txt
===================================================================
--- nel/samples/3d/cluster_viewer/CMakeLists.txt	(revision 1575)
+++ nel/samples/3d/cluster_viewer/CMakeLists.txt	(working copy)
@@ -11,7 +11,7 @@
 
 
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_clusterview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(nl_sample_clusterview PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/samples/3d/font/CMakeLists.txt
===================================================================
--- nel/samples/3d/font/CMakeLists.txt	(revision 1575)
+++ nel/samples/3d/font/CMakeLists.txt	(working copy)
@@ -9,7 +9,7 @@
 
 ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_font/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_font ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(nl_sample_font PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/samples/net/udp/CMakeLists.txt
===================================================================
--- nel/samples/net/udp/CMakeLists.txt	(revision 1575)
+++ nel/samples/net/udp/CMakeLists.txt	(working copy)
@@ -21,7 +21,7 @@
   SET(NL3D_LIB "")
 ENDIF(WITH_3D)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_udpclient ${PLATFORM_LINKFLAGS} ${NLNET_LIB} ${NL3D_LIB})
 TARGET_LINK_LIBRARIES(nl_sample_udpserver ${PLATFORM_LINKFLAGS} ${NLNET_LIB})
 IF(WIN32)
Index: nel/samples/pacs/CMakeLists.txt
===================================================================
--- nel/samples/pacs/CMakeLists.txt	(revision 1575)
+++ nel/samples/pacs/CMakeLists.txt	(working copy)
@@ -9,7 +9,7 @@
 
 ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_pacs/\\"")
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nl_sample_pacs ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB})
 IF(WIN32)
   SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
Index: nel/CMakeModules/nel.cmake
===================================================================
--- nel/CMakeModules/nel.cmake	(revision 1575)
+++ nel/CMakeModules/nel.cmake	(working copy)
@@ -120,7 +120,11 @@
     IF(WITH_COVERAGE)
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
     ENDIF(WITH_COVERAGE)
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    IF(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
+    ELSE(APPLE)
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
+    ENDIF(APPLE)
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")