mac_cmake_fixes_for_r1575.txt

rti, 05/29/2009 02:56 pm

Download (21.8 kB)

 
1 
Index: nelns/CMakeModules/FindMySQL.cmake
2 
===================================================================
3 
--- nelns/CMakeModules/FindMySQL.cmake	(revision 1575)
4 
+++ nelns/CMakeModules/FindMySQL.cmake	(working copy)
5 
@@ -18,6 +18,7 @@
6 
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
7 
       /usr/include/mysql
8 
       /usr/local/include/mysql
9 
+      /opt/local/include/mysql5/mysql
10 
       $ENV{ProgramFiles}/MySQL/*/include
11 
       $ENV{SystemDrive}/MySQL/*/include)
12
13 
@@ -33,6 +34,7 @@
14 
       /usr/local/lib
15 
       /usr/lib/mysql
16 
       /usr/local/lib/mysql
17 
+      /opt/local/lib/mysql5/mysql
18 
       )
19 
   ENDIF(WIN32 AND MSVC)
20
21 
Index: nelns/CMakeModules/nel.cmake
22 
===================================================================
23 
--- nelns/CMakeModules/nel.cmake	(revision 1575)
24 
+++ nelns/CMakeModules/nel.cmake	(working copy)
25 
@@ -119,7 +119,11 @@
26 
     IF(WITH_COVERAGE)
27 
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
28 
     ENDIF(WITH_COVERAGE)
29 
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
30 
+    IF(APPLE)
31 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
32 
+    ELSE(APPLE)
33 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
34 
+    ENDIF(APPLE)
35 
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
36 
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
37 
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
38 
Index: snowballs2/CMakeModules/nel.cmake
39 
===================================================================
40 
--- snowballs2/CMakeModules/nel.cmake	(revision 1575)
41 
+++ snowballs2/CMakeModules/nel.cmake	(working copy)
42 
@@ -115,7 +115,11 @@
43 
     SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
44 
   ELSE(WIN32)
45 
     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")
46 
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
47 
+    IF(APPLE)
48 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
49 
+    ELSE(APPLE)
50 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
51 
+    ENDIF(APPLE)
52 
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
53 
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
54 
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")
55 
Index: snowballs2/CMakeLists.txt
56 
===================================================================
57 
--- snowballs2/CMakeLists.txt	(revision 1575)
58 
+++ snowballs2/CMakeLists.txt	(working copy)
59 
@@ -68,6 +68,7 @@
60
61 
 FIND_PACKAGE(Threads REQUIRED)
62 
 FIND_PACKAGE(LibXml2 REQUIRED)
63 
+FIND_PACKAGE(PNG REQUIRED)
64
65 
 NL_SETUP_BUILD()
66
67 
Index: snowballs2/client/src/CMakeLists.txt
68 
===================================================================
69 
--- snowballs2/client/src/CMakeLists.txt	(revision 1575)
70 
+++ snowballs2/client/src/CMakeLists.txt	(working copy)
71 
@@ -2,7 +2,7 @@
72
73 
 ADD_EXECUTABLE(snowballs ${SRC})
74
75 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
76 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${PNG_INCLUDE_DIR})
77 
 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})
78 
 IF(WIN32)
79 
   SET_TARGET_PROPERTIES(snowballs PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
80 
Index: nel/src/sound/driver/openal/stdopenal.h
81 
===================================================================
82 
--- nel/src/sound/driver/openal/stdopenal.h	(revision 1575)
83 
+++ nel/src/sound/driver/openal/stdopenal.h	(working copy)
84 
@@ -38,8 +38,13 @@
85 
 #include <utility>
86 
 #include <deque>
87
88 
-#include <AL/al.h>
89 
-#include <AL/alc.h>
90 
+#ifndef NL_OS_MAC
91 
+# include <AL/al.h>
92 
+# include <AL/alc.h>
93 
+#else
94 
+# include <al.h>
95 
+# include <alc.h>
96 
+#endif
97
98 
 #include <nel/misc/common.h>
99 
 #include <nel/misc/debug.h>
100 
Index: nel/src/sound/CMakeLists.txt
101 
===================================================================
102 
--- nel/src/sound/CMakeLists.txt	(revision 1575)
103 
+++ nel/src/sound/CMakeLists.txt	(working copy)
104 
@@ -1,4 +1,4 @@
105 
-FILE(GLOB SRC *.cpp *.h)
106 
+FILE(GLOB SRC *.cpp *.h driver/sound_driver.cpp driver/buffer.cpp)
107
108 
 DECORATE_NEL_LIB("nelsound")
109 
 SET(NLSOUND_LIB ${LIBNAME})
110 
@@ -15,7 +15,8 @@
111 
   ADD_LIBRARY(${NLSOUND_LIB} STATIC ${SRC})
112 
 ENDIF(NOT WIN32)
113
114 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
115 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
116 
+
117 
 TARGET_LINK_LIBRARIES(${NLSOUND_LIB} ${LIBXML2_LIBRARIES} ${NLLIGO_LIB} ${NLGEORGES_LIB} ${NL3D_LIB})
118 
 SET_TARGET_PROPERTIES(${NLSOUND_LIB} PROPERTIES VERSION ${NL_VERSION})
119 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
120 
Index: nel/src/misc/dynloadlib.cpp
121 
===================================================================
122 
--- nel/src/misc/dynloadlib.cpp	(revision 1575)
123 
+++ nel/src/misc/dynloadlib.cpp	(working copy)
124 
@@ -75,6 +75,9 @@
125 
 #ifdef NL_OS_WINDOWS
126 
   const string	nlLibPrefix;	// empty
127 
   const string	nlLibExt(".dll");
128 
+#elif defined(NL_OS_MAC)
129 
+  const string	nlLibPrefix("lib");
130 
+  const string	nlLibExt(".dylib");
131 
 #elif defined(NL_OS_UNIX)
132 
   const string	nlLibPrefix("lib");
133 
   const string	nlLibExt(".so");
134 
Index: nel/src/logic/CMakeLists.txt
135 
===================================================================
136 
--- nel/src/logic/CMakeLists.txt	(revision 1575)
137 
+++ nel/src/logic/CMakeLists.txt	(working copy)
138 
@@ -4,6 +4,8 @@
139 
 SET(NLLOGIC_LIB ${LIBNAME})
140 
 DECORATE_NEL_LIB("nelmisc")
141 
 SET(NLMISC_LIB ${LIBNAME})
142 
+DECORATE_NEL_LIB("nelnet")
143 
+SET(NLNET_LIB ${LIBNAME})
144
145 
 IF(NOT WIN32)
146 
   ADD_LIBRARY(${NLLOGIC_LIB} SHARED ${SRC})
147 
@@ -12,7 +14,9 @@
148 
 ENDIF(NOT WIN32)
149
150 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
151 
-TARGET_LINK_LIBRARIES(${NLLOGIC_LIB} ${LIBXML2_LIBRARIES} ${NLMISC_LIB})
152 
+
153 
+TARGET_LINK_LIBRARIES(${NLLOGIC_LIB} ${LIBXML2_LIBRARIES} ${NLMISC_LIB} ${NLNET_LIB})
154 
+
155 
 SET_TARGET_PROPERTIES(${NLLOGIC_LIB} PROPERTIES VERSION ${NL_VERSION})
156
157 
 IF(WIN32)
158 
Index: nel/src/3d/driver/opengl/CMakeLists.txt
159 
===================================================================
160 
--- nel/src/3d/driver/opengl/CMakeLists.txt	(revision 1575)
161 
+++ nel/src/3d/driver/opengl/CMakeLists.txt	(working copy)
162 
@@ -11,8 +11,11 @@
163
164 
 ADD_LIBRARY(${NLDRV_OGL_LIB} SHARED ${SRC})
165
166 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
167 
-TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${NL3D_LIB} ${OPENGL_LIBRARIES})
168 
+SET(MY_OPENGL_INCLUDE_DIR "/usr/X11/include")
169 
+SET(MY_OPENGL_LIBRARIES "-L/usr/X11/lib -lX11 -lGL -framework Foundation -framework Carbon")
170 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${MY_OPENGL_INCLUDE_DIR})
171 
+TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${NL3D_LIB} ${OPENGL_LIBRARIES} ${MY_OPENGL_LIBRARIES})
172 
+
173 
 SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES VERSION ${NL_VERSION})
174
175 
 IF(WIN32)
176 
Index: nel/tools/3d/build_clodtex/CMakeLists.txt
177 
===================================================================
178 
--- nel/tools/3d/build_clodtex/CMakeLists.txt	(revision 1575)
179 
+++ nel/tools/3d/build_clodtex/CMakeLists.txt	(working copy)
180 
@@ -5,7 +5,7 @@
181
182 
 ADD_EXECUTABLE(build_clodtex ${SRC})
183
184 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
185 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
186 
 TARGET_LINK_LIBRARIES(build_clodtex ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
187 
 IF(WIN32)
188 
   SET_TARGET_PROPERTIES(build_clodtex PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
189 
Index: nel/tools/3d/build_far_bank/CMakeLists.txt
190 
===================================================================
191 
--- nel/tools/3d/build_far_bank/CMakeLists.txt	(revision 1575)
192 
+++ nel/tools/3d/build_far_bank/CMakeLists.txt	(working copy)
193 
@@ -5,7 +5,7 @@
194
195 
 ADD_EXECUTABLE(build_far_bank ${SRC})
196
197 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
198 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
199 
 TARGET_LINK_LIBRARIES(build_far_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
200 
 IF(WIN32)
201 
   SET_TARGET_PROPERTIES(build_far_bank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
202 
Index: nel/tools/3d/tga_cut/CMakeLists.txt
203 
===================================================================
204 
--- nel/tools/3d/tga_cut/CMakeLists.txt	(revision 1575)
205 
+++ nel/tools/3d/tga_cut/CMakeLists.txt	(working copy)
206 
@@ -5,7 +5,7 @@
207
208 
 ADD_EXECUTABLE(tga_cut ${SRC})
209
210 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
211 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
212 
 TARGET_LINK_LIBRARIES(tga_cut ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
213 
 IF(WIN32)
214 
   SET_TARGET_PROPERTIES(tga_cut PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
215 
Index: nel/tools/3d/file_info/CMakeLists.txt
216 
===================================================================
217 
--- nel/tools/3d/file_info/CMakeLists.txt	(revision 1575)
218 
+++ nel/tools/3d/file_info/CMakeLists.txt	(working copy)
219 
@@ -5,7 +5,7 @@
220
221 
 ADD_EXECUTABLE(file_info ${SRC})
222
223 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
224 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
225 
 TARGET_LINK_LIBRARIES(file_info ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
226 
 IF(WIN32)
227 
   SET_TARGET_PROPERTIES(file_info PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
228 
Index: nel/tools/3d/build_clod_bank/CMakeLists.txt
229 
===================================================================
230 
--- nel/tools/3d/build_clod_bank/CMakeLists.txt	(revision 1575)
231 
+++ nel/tools/3d/build_clod_bank/CMakeLists.txt	(working copy)
232 
@@ -5,7 +5,7 @@
233
234 
 ADD_EXECUTABLE(build_clod_bank ${SRC})
235
236 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
237 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
238 
 TARGET_LINK_LIBRARIES(build_clod_bank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
239 
 IF(WIN32)
240 
   SET_TARGET_PROPERTIES(build_clod_bank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
241 
Index: nel/tools/3d/zviewer/CMakeLists.txt
242 
===================================================================
243 
--- nel/tools/3d/zviewer/CMakeLists.txt	(revision 1575)
244 
+++ nel/tools/3d/zviewer/CMakeLists.txt	(working copy)
245 
@@ -11,7 +11,7 @@
246
247 
 ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"")
248
249 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
250 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
251 
 TARGET_LINK_LIBRARIES(zviewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
252 
 IF(WIN32)
253 
   SET_TARGET_PROPERTIES(zviewer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
254 
Index: nel/tools/3d/ig_lighter/CMakeLists.txt
255 
===================================================================
256 
--- nel/tools/3d/ig_lighter/CMakeLists.txt	(revision 1575)
257 
+++ nel/tools/3d/ig_lighter/CMakeLists.txt	(working copy)
258 
@@ -7,7 +7,7 @@
259
260 
 ADD_EXECUTABLE(ig_lighter ${SRC})
261
262 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
263 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
264 
 TARGET_LINK_LIBRARIES(ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLPACS_LIB})
265 
 IF(WIN32)
266 
   SET_TARGET_PROPERTIES(ig_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
267 
Index: nel/tools/3d/zone_welder/CMakeLists.txt
268 
===================================================================
269 
--- nel/tools/3d/zone_welder/CMakeLists.txt	(revision 1575)
270 
+++ nel/tools/3d/zone_welder/CMakeLists.txt	(working copy)
271 
@@ -5,7 +5,7 @@
272
273 
 ADD_EXECUTABLE(zone_welder ${SRC})
274
275 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
276 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
277 
 TARGET_LINK_LIBRARIES(zone_welder ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
278 
 IF(WIN32)
279 
   SET_TARGET_PROPERTIES(zone_welder PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
280 
Index: nel/tools/3d/build_interface/CMakeLists.txt
281 
===================================================================
282 
--- nel/tools/3d/build_interface/CMakeLists.txt	(revision 1575)
283 
+++ nel/tools/3d/build_interface/CMakeLists.txt	(working copy)
284 
@@ -5,7 +5,7 @@
285
286 
 ADD_EXECUTABLE(build_interface ${SRC})
287
288 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
289 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
290 
 TARGET_LINK_LIBRARIES(build_interface ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
291 
 IF(WIN32)
292 
   SET_TARGET_PROPERTIES(build_interface PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
293 
Index: nel/tools/3d/zone_dependencies/CMakeLists.txt
294 
===================================================================
295 
--- nel/tools/3d/zone_dependencies/CMakeLists.txt	(revision 1575)
296 
+++ nel/tools/3d/zone_dependencies/CMakeLists.txt	(working copy)
297 
@@ -7,7 +7,7 @@
298
299 
 ADD_EXECUTABLE(zone_dependencies ${SRC})
300
301 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
302 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
303 
 TARGET_LINK_LIBRARIES(zone_dependencies ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLGEORGES_LIB})
304 
 IF(WIN32)
305 
   SET_TARGET_PROPERTIES(zone_dependencies PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
306 
Index: nel/tools/3d/build_shadow_skin/CMakeLists.txt
307 
===================================================================
308 
--- nel/tools/3d/build_shadow_skin/CMakeLists.txt	(revision 1575)
309 
+++ nel/tools/3d/build_shadow_skin/CMakeLists.txt	(working copy)
310 
@@ -5,7 +5,7 @@
311
312 
 ADD_EXECUTABLE(build_shadow_skin ${SRC})
313
314 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
315 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
316 
 TARGET_LINK_LIBRARIES(build_shadow_skin ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
317 
 IF(WIN32)
318 
   SET_TARGET_PROPERTIES(build_shadow_skin PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
319 
Index: nel/tools/3d/zone_lighter/CMakeLists.txt
320 
===================================================================
321 
--- nel/tools/3d/zone_lighter/CMakeLists.txt	(revision 1575)
322 
+++ nel/tools/3d/zone_lighter/CMakeLists.txt	(working copy)
323 
@@ -7,7 +7,7 @@
324
325 
 ADD_EXECUTABLE(zone_lighter ${SRC})
326
327 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
328 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
329 
 TARGET_LINK_LIBRARIES(zone_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB} ${NLGEORGES_LIB})
330 
 IF(WIN32)
331 
   SET_TARGET_PROPERTIES(zone_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
332 
Index: nel/tools/3d/tga_resize/CMakeLists.txt
333 
===================================================================
334 
--- nel/tools/3d/tga_resize/CMakeLists.txt	(revision 1575)
335 
+++ nel/tools/3d/tga_resize/CMakeLists.txt	(working copy)
336 
@@ -5,7 +5,7 @@
337
338 
 ADD_EXECUTABLE(tga_resize ${SRC})
339
340 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
341 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
342 
 TARGET_LINK_LIBRARIES(tga_resize ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB})
343 
 IF(WIN32)
344 
   SET_TARGET_PROPERTIES(tga_resize PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
345 
Index: nel/tools/3d/zone_dump/CMakeLists.txt
346 
===================================================================
347 
--- nel/tools/3d/zone_dump/CMakeLists.txt	(revision 1575)
348 
+++ nel/tools/3d/zone_dump/CMakeLists.txt	(working copy)
349 
@@ -5,7 +5,7 @@
350
351 
 ADD_EXECUTABLE(zone_dump ${SRC})
352
353 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
354 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
355 
 TARGET_LINK_LIBRARIES(zone_dump ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
356 
 IF(WIN32)
357 
   SET_TARGET_PROPERTIES(zone_dump PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
358 
Index: nel/tools/3d/cluster_viewer/CMakeLists.txt
359 
===================================================================
360 
--- nel/tools/3d/cluster_viewer/CMakeLists.txt	(revision 1575)
361 
+++ nel/tools/3d/cluster_viewer/CMakeLists.txt	(working copy)
362 
@@ -5,7 +5,7 @@
363
364 
 ADD_EXECUTABLE(cluster_viewer ${SRC})
365
366 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
367 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
368 
 TARGET_LINK_LIBRARIES(cluster_viewer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
369 
 IF(WIN32)
370 
   SET_TARGET_PROPERTIES(cluster_viewer PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
371 
Index: nel/tools/3d/build_coarse_mesh/CMakeLists.txt
372 
===================================================================
373 
--- nel/tools/3d/build_coarse_mesh/CMakeLists.txt	(revision 1575)
374 
+++ nel/tools/3d/build_coarse_mesh/CMakeLists.txt	(working copy)
375 
@@ -5,7 +5,7 @@
376
377 
 ADD_EXECUTABLE(build_coarse_mesh ${SRC})
378
379 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
380 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
381 
 TARGET_LINK_LIBRARIES(build_coarse_mesh ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
382 
 IF(WIN32)
383 
   SET_TARGET_PROPERTIES(build_coarse_mesh PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
384 
Index: nel/tools/3d/zone_ig_lighter/CMakeLists.txt
385 
===================================================================
386 
--- nel/tools/3d/zone_ig_lighter/CMakeLists.txt	(revision 1575)
387 
+++ nel/tools/3d/zone_ig_lighter/CMakeLists.txt	(working copy)
388 
@@ -5,7 +5,7 @@
389
390 
 ADD_EXECUTABLE(zone_ig_lighter ${SRC})
391
392 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
393 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
394 
 TARGET_LINK_LIBRARIES(zone_ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
395 
 IF(WIN32)
396 
   SET_TARGET_PROPERTIES(zone_ig_lighter PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
397 
Index: nel/tools/pacs/build_rbank/CMakeLists.txt
398 
===================================================================
399 
--- nel/tools/pacs/build_rbank/CMakeLists.txt	(revision 1575)
400 
+++ nel/tools/pacs/build_rbank/CMakeLists.txt	(working copy)
401 
@@ -11,7 +11,7 @@
402
403 
 ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"")
404
405 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
406 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
407 
 TARGET_LINK_LIBRARIES(build_rbank ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB} ${NLLIGO_LIB})
408 
 IF(WIN32)
409 
   SET_TARGET_PROPERTIES(build_rbank PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
410 
Index: nel/tools/pacs/build_ig_boxes/CMakeLists.txt
411 
===================================================================
412 
--- nel/tools/pacs/build_ig_boxes/CMakeLists.txt	(revision 1575)
413 
+++ nel/tools/pacs/build_ig_boxes/CMakeLists.txt	(working copy)
414 
@@ -9,7 +9,7 @@
415
416 
 ADD_DEFINITIONS(-DNL_BIB_CFG="\\"${NL_ETC_PREFIX}/\\"")
417
418 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
419 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
420 
 TARGET_LINK_LIBRARIES(build_ig_boxes ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB})
421 
 IF(WIN32)
422 
   SET_TARGET_PROPERTIES(build_ig_boxes PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
423 
Index: nel/samples/3d/shape_viewer/CMakeLists.txt
424 
===================================================================
425 
--- nel/samples/3d/shape_viewer/CMakeLists.txt	(revision 1575)
426 
+++ nel/samples/3d/shape_viewer/CMakeLists.txt	(working copy)
427 
@@ -7,7 +7,7 @@
428
429 
 ADD_EXECUTABLE(nl_sample_shapeview ${SRC})
430
431 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
432 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
433 
 TARGET_LINK_LIBRARIES(nl_sample_shapeview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
434 
 IF(WIN32)
435 
   SET_TARGET_PROPERTIES(nl_sample_shapeview PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
436 
Index: nel/samples/3d/cluster_viewer/CMakeLists.txt
437 
===================================================================
438 
--- nel/samples/3d/cluster_viewer/CMakeLists.txt	(revision 1575)
439 
+++ nel/samples/3d/cluster_viewer/CMakeLists.txt	(working copy)
440 
@@ -11,7 +11,7 @@
441
442
443
444 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
445 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
446 
 TARGET_LINK_LIBRARIES(nl_sample_clusterview ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
447 
 IF(WIN32)
448 
   SET_TARGET_PROPERTIES(nl_sample_clusterview PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
449 
Index: nel/samples/3d/font/CMakeLists.txt
450 
===================================================================
451 
--- nel/samples/3d/font/CMakeLists.txt	(revision 1575)
452 
+++ nel/samples/3d/font/CMakeLists.txt	(working copy)
453 
@@ -9,7 +9,7 @@
454
455 
 ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_font/\\"")
456
457 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
458 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
459 
 TARGET_LINK_LIBRARIES(nl_sample_font ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB} ${NL3D_LIB})
460 
 IF(WIN32)
461 
   SET_TARGET_PROPERTIES(nl_sample_font PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
462 
Index: nel/samples/net/udp/CMakeLists.txt
463 
===================================================================
464 
--- nel/samples/net/udp/CMakeLists.txt	(revision 1575)
465 
+++ nel/samples/net/udp/CMakeLists.txt	(working copy)
466 
@@ -21,7 +21,7 @@
467 
   SET(NL3D_LIB "")
468 
 ENDIF(WITH_3D)
469
470 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
471 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
472 
 TARGET_LINK_LIBRARIES(nl_sample_udpclient ${PLATFORM_LINKFLAGS} ${NLNET_LIB} ${NL3D_LIB})
473 
 TARGET_LINK_LIBRARIES(nl_sample_udpserver ${PLATFORM_LINKFLAGS} ${NLNET_LIB})
474 
 IF(WIN32)
475 
Index: nel/samples/pacs/CMakeLists.txt
476 
===================================================================
477 
--- nel/samples/pacs/CMakeLists.txt	(revision 1575)
478 
+++ nel/samples/pacs/CMakeLists.txt	(working copy)
479 
@@ -9,7 +9,7 @@
480
481 
 ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_pacs/\\"")
482
483 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
484 
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
485 
 TARGET_LINK_LIBRARIES(nl_sample_pacs ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLPACS_LIB} ${NL3D_LIB})
486 
 IF(WIN32)
487 
   SET_TARGET_PROPERTIES(nl_sample_pacs PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS")
488 
Index: nel/CMakeModules/nel.cmake
489 
===================================================================
490 
--- nel/CMakeModules/nel.cmake	(revision 1575)
491 
+++ nel/CMakeModules/nel.cmake	(working copy)
492 
@@ -120,7 +120,11 @@
493 
     IF(WITH_COVERAGE)
494 
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
495 
     ENDIF(WITH_COVERAGE)
496 
-    SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
497 
+    IF(APPLE)
498 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++")
499 
+    ELSE(APPLE)
500 
+      SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
501 
+    ENDIF(APPLE)
502 
     SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
503 
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
504 
     SET(NL_RELEASEDEBUG_CFLAGS "-DNL_RELEASE_DEBUG -g -finline-functions -O3 ")