diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-04 20:20:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-04 20:20:42 +0400 |
| commit | cc68f45502a0e6f94715eb61898b17fdfeba1da9 (patch) | |
| tree | d8bea72405475af1bed95ed416379896cd18d48c /source | |
| parent | 05d2b904b2110855f1e668177287c892eb6dbe41 (diff) | |
Fix cmake/OSX build after path changes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 24b74b40a37..e2cb0e131a5 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -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_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 diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 185e1c9c960..21cd92c0e95 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -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") |