Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-08-14 17:13:36 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-08-14 17:13:36 +0400
commitc32fce07051572460070fb36ce85519565899c92 (patch)
tree76755649dad4e4c92276d794a7bdffd21af21f9e /source
parent08f0938434598b23d0dd1879f598e342a194cb63 (diff)
some fixes for netbsd with cmake
- CMake, use FIND_PACKAGE(Freetype) for unix/linux - Only link with libdl.so on linux - use statvfs rather then statfs for netbsd (size of statfs wasnt available) - add x11 include path with ghost, glu.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/intern/storage.c8
-rw-r--r--source/blender/blenloader/BLO_sys_types.h2
-rw-r--r--source/blender/python/intern/bpy_interface.c4
-rw-r--r--source/blender/windowmanager/CMakeLists.txt1
4 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index 0a416e624cb..e6e37c58805 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -47,13 +47,13 @@
#include <time.h>
#include <sys/stat.h>
-#if defined (__sun__) || defined (__sun) || defined (__sgi)
+#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
#include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
#include <sys/statfs.h>
#endif
-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+#if defined (__FreeBSD__) || defined (__OpenBSD__)
#include <sys/param.h>
#include <sys/mount.h>
#endif
@@ -173,7 +173,7 @@ double BLI_diskfree(char *dir)
return (double) (freec*bytesps*sectorspc);
#else
-#if defined (__sun__) || defined (__sun) || defined (__sgi)
+#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
struct statvfs disk;
#else
struct statfs disk;
@@ -195,7 +195,7 @@ double BLI_diskfree(char *dir)
if (statfs(name, &disk)) return(-1);
#endif
-#if defined (__sun__) || defined (__sun) || defined (__sgi)
+#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
if (statvfs(name, &disk)) return(-1);
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
/* WARNING - This may not be supported by geeneric unix os's - Campbell */
diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index 49155260b31..4032f778f4b 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -78,7 +78,7 @@ typedef unsigned long uintptr_t;
#define _UINTPTR_T_DEFINED
#endif
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__NetBSD__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index ca5f933de80..1af656e560f 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -270,7 +270,7 @@ void BPY_start_python( int argc, char **argv )
void BPY_end_python( void )
{
- fprintf(stderr, "Ending Python!\n");
+ // fprintf(stderr, "Ending Python!\n");
PyGILState_Ensure(); /* finalizing, no need to grab the state */
@@ -296,7 +296,7 @@ void BPY_end_python( void )
printf("\n");
- fprintf(stderr, "Ending Python Done!\n");
+ // fprintf(stderr, "Ending Python Done!\n");
#endif
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 69ebedbc684..4358eea6f1b 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -40,6 +40,7 @@ SET(INC .
../gpu
../blenfont
${SDL_INC}
+ ${OPENGL_INCLUDE_DIR}
)
IF(WITH_INTERNATIONAL)