diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-19 18:57:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-19 18:57:02 +0300 |
| commit | 9396bb2da92080dc44cb255e3f37c8fcac6ead79 (patch) | |
| tree | 2306bf9a07c14e7a5c880ff26c8d19a0c636118b /intern | |
| parent | 4fe037f53f7ae5a45e4518c6b0b8780ae43b62af (diff) | |
- AIX ifdef's so windows works, cant test but this seems the most used define. might need to add to buildsystem config.
- transform default scale was too hight, calls to random were inconsistant. (fault of own modif's)
- cmake openal include was added twice on recent commit.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 | ||||
| -rw-r--r-- | intern/string/intern/STR_String.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 7a3cb88db9c..0965a467201 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -20,7 +20,7 @@ # # ***** END LGPL LICENSE BLOCK ***** -SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC} ${OPENAL_INCLUDE_DIR}) +SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC}) FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp) diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index efde9005fe4..c04b3379b60 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -35,7 +35,7 @@ #include <X11/cursorfont.h> #include <X11/Xatom.h> -#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) +#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX) #include <strings.h> #endif diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index b81ef064984..8b16452ed34 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -39,11 +39,9 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> - -#ifndef WIN32 +#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX) #include <strings.h> #endif - #include "STR_String.h" /*------------------------------------------------------------------------------------------------- |