Fix cmake/OSX build after path changes.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 4 Jul 2010 16:20:42 +0000 (16:20 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 4 Jul 2010 16:20:42 +0000 (16:20 +0000)
source/blender/blenlib/BLI_path_util.h
source/blender/blenlib/CMakeLists.txt

index 24b74b40a3732152795425eeb8564d94cb95277b..e2cb0e131a51b6585b6f1f78062b7f30ccb5c75e 100644 (file)
 #ifndef BLI_UTIL_H
 #define BLI_UTIL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 struct direntry;
 
@@ -191,5 +195,9 @@ void BLI_where_is_temp(char *fullname, int usertemp);
 void BLI_string_to_utf8(char *original, char *utf_8, const char *code);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
index 185e1c9c960b08aff8951eb009a075c0e062421d..21cd92c0e9523514e06dd65dc2ef0c3fc1364719 100644 (file)
@@ -34,7 +34,7 @@ SET(INC
 )
 
 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")