diff options
author | Ton Roosendaal <ton@blender.org> | 2005-06-08 22:55:49 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-06-08 22:55:49 +0400 |
commit | 205b6501a0ad8e792d2d7cc32dc3ba25b7613ec2 (patch) | |
tree | c82cd64d5849e161f738334606fc676d33a2ffa5 /intern | |
parent | ce68fddc0db812dd827ffd2d8bf90fb0badcb90e (diff) |
(Accidentally sent previous commit without message... is same stuff)
gcc4 error fixes for compiling in OSX Tiger
Also; make using python framework default in makefiles
Diffstat (limited to 'intern')
-rw-r--r-- | intern/SoundSystem/openal/SND_OpenALDevice.cpp | 4 | ||||
-rw-r--r-- | intern/bmfont/intern/BMF_BitmapFont.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCarbon.cpp | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp index fdad75db767..2a320568e2a 100644 --- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp +++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp @@ -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); diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp index 521cd67a325..6af8e9eaa2c 100644 --- a/intern/bmfont/intern/BMF_BitmapFont.cpp +++ b/intern/bmfont/intern/BMF_BitmapFont.cpp @@ -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; } diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index ad19f08c950..bd271fd0c8d 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -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); |