[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29938] trunk/blender/source/blender/ blenlib: Fix cmake/OSX build after path changes.

[Brecht Van Lommel]

Revision: 29938
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29938
Author:   blendix
Date:     2010-07-04 18:20:42 +0200 (Sun, 04 Jul 2010)

Log Message:
-----------
Fix cmake/OSX build after path changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_path_util.h
    trunk/blender/source/blender/blenlib/CMakeLists.txt

Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h	2010-07-04 15:52:32 UTC (rev 29937)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h	2010-07-04 16:20:42 UTC (rev 29938)
@@ -33,6 +33,10 @@
 #ifndef BLI_UTIL_H
 #define BLI_UTIL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 struct direntry;
 
@@ -191,5 +195,9 @@
 void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
 #endif
 
+#ifdef __cplusplus
+}
 #endif
 
+#endif
+

Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt	2010-07-04 15:52:32 UTC (rev 29937)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt	2010-07-04 16:20:42 UTC (rev 29938)
@@ -34,7 +34,7 @@
 )
 
 IF(APPLE)
-	SET(SRC ${SRC} intern/path_util_cocoa.m)
+	SET(SRC ${SRC} intern/path_util_cocoa.mm)
 ENDIF(APPLE)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")