sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

(Accidentally sent previous commit without message... is same stuff)

Browse Source 
gcc4 error fixes for compiling in OSX Tiger

Also; make using python framework default in makefiles
This commit is contained in:
Ton Roosendaal 2005-06-08 18:55:49 +00:00
parent ce68fddc0d
commit 205b6501a0
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/SoundSystem/openal/SND_OpenALDevice.cpp
View File

@ -430,9 +430,9 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
else
{
#ifdef __APPLE__
alutLoadWAVFile((signed char*)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate);
alutLoadWAVFile((ALbyte *)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate);
#else
alutLoadWAVFile((signed char*)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate, &loop);
alutLoadWAVFile((ALbyte *)samplename.Ptr(), &sampleformat, &data, &numberofsamples, &samplerate, &loop);
#endif
/* put it in the buffer */
alBufferData(m_buffers[buffer], sampleformat, data, numberofsamples, samplerate);

2
intern/bmfont/intern/BMF_BitmapFont.cpp
View File

@ -76,7 +76,7 @@ static int is_a_really_crappy_nvidia_card(void) {
/* Do you understand the implication? Do you? */
if (well_is_it==-1) {
well_is_it= (strncmp(glGetString(GL_RENDERER), "NVIDIA GeForce 6800", 18) == 0);
well_is_it= (strncmp((char *)glGetString(GL_RENDERER), "NVIDIA GeForce 6800", 18) == 0);
}
return well_is_it;
}

10
intern/ghost/intern/GHOST_WindowCarbon.cpp
View File

@ -115,8 +115,14 @@ GHOST_WindowCarbon::GHOST_WindowCarbon(
//fprintf(stderr," main screen top %i left %i height %i width %i\n", top, left, height, width);
if (state >= 8 ) {
state = state - 8;
if (state >= GHOST_kWindowState8Normal ) {
if(state == GHOST_kWindowState8Normal) state= GHOST_kWindowStateNormal;
else if(state == GHOST_kWindowState8Maximized) state= GHOST_kWindowStateMaximized;
else if(state == GHOST_kWindowState8Minimized) state= GHOST_kWindowStateMinimized;
else if(state == GHOST_kWindowState8FullScreen) state= GHOST_kWindowStateFullScreen;
// state = state - 8; this was the simple version of above code, doesnt work in gcc 4.0
setMac_windowState(1);
} else
setMac_windowState(0);

1
source/blender/quicktime/quicktime_import.h
View File

@ -49,6 +49,7 @@
#ifdef _WIN32
#include <Movies.h>
#elif defined(__APPLE__)
#import <Carbon/Carbon.h>
#include <QuickTime/Movies.h>
#endif
#endif

10
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
View File

@ -110,32 +110,32 @@ static OSStatus bglInitEntryPoints (void)
err = FindFolder (kSystemDomain, kFrameworksFolderType, false,
&fileRefParam.ioVRefNum, &fileRefParam.ioDirID);
if (noErr != err) {
DebugStr ("\pCould not find frameworks folder");
DebugStr ((unsigned char *)"\pCould not find frameworks folder");
return err;
}
err = PBMakeFSRefSync (&fileRefParam); // make FSRef for folder
if (noErr != err) {
DebugStr ("\pCould make FSref to frameworks folder");
DebugStr ((unsigned char *)"\pCould make FSref to frameworks folder");
return err;
}
// create URL to folder
bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault,
&fileRef);
if (!bundleURLOpenGL) {
DebugStr ("\pCould create OpenGL Framework bundle URL");
DebugStr ((unsigned char *)"\pCould create OpenGL Framework bundle URL");
return paramErr;
}
// create ref to GL's bundle
gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,
bundleURLOpenGL);
if (!gBundleRefOpenGL) {
DebugStr ("\pCould not create OpenGL Framework bundle");
DebugStr ((unsigned char *)"\pCould not create OpenGL Framework bundle");
return paramErr;
}
CFRelease (bundleURLOpenGL); // release created bundle
// if the code was successfully loaded, look for our function.
if (!CFBundleLoadExecutable (gBundleRefOpenGL)) {
DebugStr ("\pCould not load MachO executable");
DebugStr ((unsigned char *)"\pCould not load MachO executable");
return paramErr;
}
return err;

2
source/nan_definitions.mk
View File

@ -139,7 +139,7 @@ endif
export ID = $(shell whoami)
export HOST = $(shell hostname -s)
# export PY_FRAMEWORK = 1
export PY_FRAMEWORK = 1
ifdef PY_FRAMEWORK
export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3